From af28851a3a649faee999758406619344999b9b2d Mon Sep 17 00:00:00 2001
From: zhangyue <zhangyue>
Date: Wed, 20 May 2026 08:52:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=89=E5=85=A8=E7=8E=AF?=
 =?UTF-8?q?=E4=BF=9D=E6=A3=80=E6=9F=A5=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=A2=9E=E5=BC=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SafetyEnvironmentalInspectionPageQry.java |  3 ++
 .../main/resources/mapper/HiddenMapper.xml    |  2 +-
 .../resources/mapper/KeyProjectMapper.xml     | 41 ++++++++++---------
 .../SafetyEnvironmentalInspectionMapper.xml   |  9 ++++
 4 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionPageQry.java
index d9d3ac6..ae13682 100644
--- a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionPageQry.java
+++ b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionPageQry.java
@@ -35,9 +35,12 @@ public class SafetyEnvironmentalInspectionPageQry extends PageQuery {
     private String projectName;
     private String inspectionUserName;
     private List<Integer> statusList;
+    private List<Integer> noStatusList;
     private Integer status;
     private String year;
     private String menuPath;
+    private Long corpinfoId;
+
 
 
 
diff --git a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml
index c8a61d0..d6e262c 100644
--- a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml
@@ -21,7 +21,7 @@
         left join user hfu on hfu.id = hf.find_user_id
         left join department hfd on hfd.id = hfu.department_id
         left join user au on au.id = h.accept_user_id
-        left join safety_environmental_inspection i on i.inspection_id = h.foreign_key and i.status = 3 and h.source in (2, 3)
+        left join safety_environmental_inspection i on i.inspection_id = h.foreign_key and i.status in (3,5) and h.source in (2, 3)
         left join key_project kp on kp.key_project_id = i.key_project_id
         left join ai_alarm aa on h.foreign_key = aa.ai_alarm_id and h.source = 1
         left join key_project kp2 on kp2.key_project_id = aa.key_project_id
diff --git a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml
index 2c97a17..d0e23c6 100644
--- a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml
@@ -171,7 +171,7 @@
 
             <!-- corpinfoId 判空 -->
             <if test="params.corpinfoId != null">
-                AND kp.corpinfo_id = #{params.corpinfoId}
+                AND kp.jurisdiction_corpinfo_id = #{params.corpinfoId}
             </if>
 
             <!-- projectType 判空 -->
@@ -204,28 +204,29 @@
     </select>
 
     <select id="corpStatistics" resultType="com.zcloud.key.project.persistence.dataobject.project.CorpStatisticsDO">
-        SELECT cp.id                                                AS corpinfoId,
-               cp.corp_name                                         AS corpinfoName,
-                COUNT(distinct kp.id)                                         AS totalProjectCount,
-                COUNT(DISTINCT CASE WHEN kp.apply_status = 4 THEN kp.id END) AS startCount,
-                COUNT(DISTINCT CASE WHEN kp.apply_status = 6 THEN kp.id END) AS completeCount,
-                COUNT(DISTINCT CASE WHEN kpc.camera_type = 1 THEN kpc.camera_id END) AS fixedCameraCount,
-                COUNT(DISTINCT CASE WHEN kpc.camera_type = 2 THEN kpc.camera_id END) AS mobileCameraCount,
-                COUNT(sei.id) AS inspectCount,
-                COUNT(h.id) AS hazardCount,
-                GROUP_CONCAT(DISTINCT CASE WHEN kpc.camera_type = 1 THEN kpc.camera_id END) AS fixedCameraIdList,
-                GROUP_CONCAT(DISTINCT CASE WHEN kpc.camera_type = 2 THEN kpc.camera_id END) AS mobileCameraIdList
+        SELECT cp.id AS corpinfoId,
+            cp.corp_name AS corpinfoName,
+            COUNT(distinct kp.id) AS totalProjectCount,
+            COUNT(DISTINCT CASE WHEN kp.apply_status in (2,3,4,5) THEN kp.id END) AS startCount,
+            COUNT(DISTINCT CASE WHEN kp.apply_status = 6 THEN kp.id END) AS completeCount,
+            COUNT(DISTINCT CASE WHEN kpc.camera_type = 1 THEN kpc.camera_id END) AS fixedCameraCount,
+            COUNT(DISTINCT CASE WHEN kpc.camera_type = 2 THEN kpc.camera_id END) AS mobileCameraCount,
+            COUNT(DISTINCT sei.id) AS inspectCount,
+            COUNT(DISTINCT h.id) AS hazardCount,
+            GROUP_CONCAT(DISTINCT CASE WHEN kpc.camera_type = 1 THEN kpc.camera_id END) AS fixedCameraIdList,
+            GROUP_CONCAT(DISTINCT CASE WHEN kpc.camera_type = 2 THEN kpc.camera_id END) AS mobileCameraIdList
         FROM corp_info cp
-                 LEFT JOIN key_project kp
-                           ON cp.id = kp.jurisdiction_corpinfo_id AND kp.delete_enum = 'FALSE' AND kp.apply_status NOT IN (0,1)
-                 left join key_project_camera kpc on kp.key_project_id = kpc.key_project_id AND kpc.delete_enum = 'FALSE'
-                left join safety_environmental_inspection sei on cp.id = sei.corp_id AND sei.delete_enum = 'FALSE' and sei.status != 0
-                left join hidden h on cp.id = h.tenant_id AND h.delete_enum = 'FALSE'
+        LEFT JOIN key_project kp
+            ON cp.id = kp.jurisdiction_corpinfo_id AND kp.delete_enum = 'FALSE' AND kp.apply_status NOT IN (0,1)
+        left join key_project_camera kpc on kp.key_project_id = kpc.key_project_id AND kpc.delete_enum = 'FALSE'
+        left join safety_environmental_inspection sei on cp.id = sei.corp_id AND sei.delete_enum = 'FALSE' and
+            sei.status != 0
+        left join hidden h on cp.id = h.tenant_id AND h.delete_enum = 'FALSE'
         WHERE cp.delete_enum = 'FALSE'
-          AND cp.use_flag = 1
-          AND cp.type IN (0, 1, 2, 6)
+            AND cp.use_flag = 1
+            AND cp.type IN (0, 1, 2, 6)
             <if test="params.corpinfoName != null and params.corpinfoName != ''">
-            AND cp.corp_name like concat('%',#{params.corpinfoName},'%')
+                AND cp.corp_name like concat('%',#{params.co rpinfoName},'%')
             </if>
         GROUP BY cp.id
         order by cp.corp_order ASC,cp.create_time desc
diff --git a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml
index 47750c6..e6815bc 100644
--- a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml
@@ -75,9 +75,18 @@
                 #{st}
             </foreach>
         </if>
+        <if test="params.noStatusList != null and params.noStatusList.size() > 0">
+            and i.status not in
+            <foreach item="st" collection="params.noStatusList" separator="," open="(" close=")" >
+                #{nst}
+            </foreach>
+        </if>
         <if test="params.status != null">
             and i.status = #{params.status}
         </if>
+        <if test="params.corpinfoId != null">
+            and i.corp_id = #{params.corpinfoId}
+        </if>
 
         GROUP BY i.id
         <if test="params.inspectionUserName != null and params.inspectionUserName != ''">