添加安全环保检查查询功能增强

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;
+
 
 
 

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

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 判空 -->
@@ -207,25 +207,26 @@
         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 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(sei.id) AS inspectCount,
-                COUNT(h.id) AS hazardCount,
+            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 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)
             <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

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 != ''">