From e76b3a35aae14508b8711202055e327e25b05a00 Mon Sep 17 00:00:00 2001
From: shihongwei <178899525@qq.com>
Date: Wed, 3 Jun 2026 21:07:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(securityManagement):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=B7=A1=E6=A3=80=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2SQL=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

重构该Mapper的分页查询SQL，调整表关联与过滤条件，优化状态计算、搜索匹配及排序规则，修复原查询的数据统计与展示问题。
---
 .../HotHiddenDangerInspectionMapper.xml       | 81 ++++++++-----------
 1 file changed, 32 insertions(+), 49 deletions(-)

diff --git a/src/main/resources/mapper/securityManagement/HotHiddenDangerInspectionMapper.xml b/src/main/resources/mapper/securityManagement/HotHiddenDangerInspectionMapper.xml
index e163a7b..0d91fc8 100644
--- a/src/main/resources/mapper/securityManagement/HotHiddenDangerInspectionMapper.xml
+++ b/src/main/resources/mapper/securityManagement/HotHiddenDangerInspectionMapper.xml
@@ -8,38 +8,31 @@
     <select id="selectMobilePlanPage"
             resultType="com.hotwj.platform.securityManagement.hiddenDangerInspection.domain.vo.HotHiddenDangerInspectionVo">
         SELECT
-            p.id AS id,
-            p.company_id AS companyId,
-            p.id AS planId,
-            p.inspect_name AS projectName,
+            i.id AS id,
+            i.company_id AS companyId,
+            i.plan_id AS planId,
+            i.project_name AS projectName,
+            i.project_id AS projectId,
+            i.project_type AS projectType,
             p.plan_name AS planName,
             p.start_date AS planStartDate,
             p.end_date AS planEndDate,
             CASE
-                WHEN SUM(CASE WHEN i.status IS NULL OR i.status = 1 OR i.status = 2 THEN 1 ELSE 0 END) > 0 THEN 1
-                ELSE 3
-            END AS status,
-            CASE
-                WHEN SUM(CASE WHEN i.status IS NULL OR i.status = 1 OR i.status = 2 THEN 1 ELSE 0 END) > 0 THEN 1
+                WHEN i.status IS NULL OR i.status = 1 OR i.status = 2 THEN 1
+                WHEN i.status = 10 THEN 1
                 ELSE 2
             END AS todoSortGroup,
             CASE
-                WHEN SUM(CASE WHEN i.status IS NULL OR i.status = 1 OR i.status = 2 THEN 1 ELSE 0 END) > 0 THEN '未做'
+                WHEN i.status IS NULL OR i.status = 1 OR i.status = 2 THEN '未做'
+                WHEN i.status = 10 THEN '驳回'
                 ELSE '已完成'
-            END AS todoSortLabel
-        FROM hot_hidden_danger_plan p
-        LEFT JOIN hot_hidden_danger_inspection i
-            ON i.plan_id = p.id
-            AND i.is_deleted = 0
-            <if test="isAdmin == false">
-                AND (
-                    (i.project_type = 3 AND i.project_id = #{driverId})
-                    <if test="vehicleId != null and vehicleId != ''">
-                        OR (i.project_type = 2 AND i.project_id = #{vehicleId})
-                    </if>
-                )
-            </if>
-        WHERE p.is_deleted = 0
+            END AS todoSortLabel,
+            COALESCE(i.status, 0) AS status
+        FROM hot_hidden_danger_inspection i
+        INNER JOIN hot_hidden_danger_plan p
+            ON p.id = i.plan_id
+            AND p.is_deleted = 0
+        WHERE i.is_deleted = 0
             AND p.company_id = #{companyId}
             AND (
                 (NOW() BETWEEN p.start_date AND p.end_date)
@@ -48,39 +41,29 @@
                     AND NOW() BETWEEN p.recheck_start_time AND p.recheck_end_time
                 )
             )
-        <if test="planId != null">
-            AND p.id = #{planId}
-        </if>
-            AND EXISTS (
-                SELECT 1
-                FROM hot_hidden_danger_inspection i2
-                WHERE i2.plan_id = p.id
-                  AND i2.is_deleted = 0
-                <if test="isAdmin == false">
-                    AND (
-                        (i2.project_type = 3 AND i2.project_id = #{driverId})
-                        <if test="vehicleId != null and vehicleId != ''">
-                            OR (i2.project_type = 2 AND i2.project_id = #{vehicleId})
-                        </if>
-                    )
+        <if test="isAdmin == false">
+            AND (
+                (i.project_type = 3 AND i.project_id = #{driverId})
+                <if test="vehicleId != null and vehicleId != ''">
+                    OR (i.project_type = 2 AND i.project_id = #{vehicleId})
                 </if>
             )
+        </if>
+        <if test="planId != null">
+            AND i.plan_id = #{planId}
+        </if>
         <if test="keyword != null and keyword != ''">
             AND (
                 p.plan_name LIKE CONCAT('%', #{keyword}, '%')
-                OR p.inspect_name LIKE CONCAT('%', #{keyword}, '%')
+                OR i.project_name LIKE CONCAT('%', #{keyword}, '%')
+                <if test="isAdmin == false">
+                    OR i.project_id LIKE CONCAT('%', #{keyword}, '%')
+                </if>
             )
         </if>
-        GROUP BY
-            p.id,
-            p.company_id,
-            p.inspect_name,
-            p.plan_name,
-            p.start_date,
-            p.end_date
         ORDER BY
             todoSortGroup ASC,
-            COALESCE(p.end_date, p.start_date, MAX(i.create_time)) ASC,
-            p.id DESC
+            COALESCE(p.end_date, p.start_date, i.create_time) ASC,
+            i.id DESC
     </select>
 </mapper>