From 6d288e7d3ee78723d01e66938c7eb071fe50916e Mon Sep 17 00:00:00 2001
From: 18980591175 <470162950@qq.com>
Date: Fri, 29 May 2026 12:55:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HotVehicleThreeInspectMapper.xml          | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/mapper/securityManagement/HotVehicleThreeInspectMapper.xml b/src/main/resources/mapper/securityManagement/HotVehicleThreeInspectMapper.xml
index 20726f1..7a0d46d 100644
--- a/src/main/resources/mapper/securityManagement/HotVehicleThreeInspectMapper.xml
+++ b/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
-            AND t2.is_deleted = 0
-            AND (
-            t2.create_time > t.create_time
-            OR (t2.create_time = t.create_time AND t2.id > t.id)
-            )
+                SELECT 1
+                FROM hot_vehicle_three_inspect t2
+                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>