车辆切换

src/main/resources/mapper/securityManagement/HotVehicleThreeInspectMapper.xml

@@ -214,30 +214,31 @@
         v.id AS vehicleId,
         v.plate_number AS plateNumber,
         v.vehicle_type AS vehicleType
-        FROM hot_vehicle_three_inspect t
-        LEFT JOIN hot_vehicle v ON t.vehicle_id = v.id
-        <where>
-            t.is_deleted = 0
-            AND v.is_deleted = 0
-            AND t.inspect_phase = 3
+        FROM hot_vehicle v
+        LEFT JOIN hot_vehicle_three_inspect t
+            ON t.vehicle_id = v.id
+            AND t.is_deleted = 0
             AND NOT EXISTS (
                 SELECT 1
                 FROM hot_vehicle_three_inspect t2
-            WHERE t2.vehicle_id = t.vehicle_id
+                WHERE t2.vehicle_id = v.id
                   AND t2.is_deleted = 0
                   AND (
                     t2.create_time > t.create_time
                     OR (t2.create_time = t.create_time AND t2.id > t.id)
                   )
             )
+        <where>
+            v.is_deleted = 0
+            AND (t.id IS NULL OR t.inspect_phase = 3)
             <if test="bo.companyId != null">
-                AND t.company_id = #{bo.companyId}
+                AND v.company_id = #{bo.companyId}
             </if>
             <if test="bo.plateNumber != null and bo.plateNumber != ''">
                 AND v.plate_number LIKE CONCAT('%', #{bo.plateNumber}, '%')
             </if>
         </where>
-        ORDER BY IFNULL(t.inspect_time, t.create_time) DESC, t.create_time DESC, t.id DESC
+        ORDER BY IFNULL(IFNULL(t.inspect_time, t.create_time), v.create_time) DESC, t.create_time DESC, t.id DESC
     </select>
 
 </mapper>