From 73da9e415391acbe4ad1ca8079a12e76a798321a Mon Sep 17 00:00:00 2001 From: lishiwei <3230787218@qq.com> Date: Thu, 2 Jul 2026 09:06:35 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E5=A4=8D=E9=9A=90=E6=82=A3?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=92=8C=E5=85=B3=E9=94=AE=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../key/project/dto/hidden/HiddenPageQry.java | 1 + .../main/resources/mapper/HiddenMapper.xml | 2 +- .../resources/mapper/KeyProjectMapper.xml | 20 +++++++++++++------ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPageQry.java index ccf1005..7505622 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPageQry.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPageQry.java @@ -30,6 +30,7 @@ public class HiddenPageQry extends PageQuery { private Integer source; private String startTime; private String endTime; + private String keyProjectId; private String projectName; private String hiddenFindUserName; private String rectificationUserName; diff --git a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml index ec972a5..bbf04da 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 in (3,5) and h.source in (2, 3) + left join safety_environmental_inspection i on i.inspection_id = h.foreign_key and i.delete_enum = 'FALSE' and i.status != 0 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 3e9c209..cb7a9a4 100644 --- a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml @@ -220,7 +220,7 @@ 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 != 0 + ON cp.id = kp.jurisdiction_corpinfo_id AND kp.delete_enum = 'FALSE' AND kp.apply_status != 0 AND kp.apply_status != 7 left join key_project_camera kpc on kp.key_project_id = kpc.key_project_id AND kpc.delete_enum = 'FALSE' LEFT JOIN camera c ON c.camera_id = kpc.camera_id left join safety_environmental_inspection sei on cp.id = sei.corp_id AND sei.delete_enum = 'FALSE' and @@ -246,7 +246,7 @@ AND cp.use_flag = 1 AND cp.type IN (0, 1, 2, 6) - AND cp.corp_name like concat('%',#{params.co rpinfoName},'%') + AND cp.corp_name like concat('%',#{params.corpinfoName},'%') GROUP BY cp.id order by cp.corp_order ASC,cp.create_time desc @@ -261,15 +261,23 @@ COUNT(DISTINCT CASE WHEN kpc.camera_type = 2 THEN kpc.camera_id END) AS mobileCameraCount, COUNT(DISTINCT CASE WHEN kpc.camera_type = 1 AND c.is_online = 1 THEN kpc.camera_id END) AS onlineFixedCameraCount, COUNT(DISTINCT CASE WHEN kpc.camera_type = 2 AND c.is_online = 1 THEN kpc.camera_id END) AS onlineMobileCameraCount, - COUNT(DISTINCT sei.id) AS inspectCount, - COUNT(DISTINCT h.id) AS hazardCount, + COALESCE(sei_stat.inspectCount, 0) AS inspectCount, + COALESCE(sei_stat.hazardCount, 0) 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 key_project kp left join key_project_camera kpc on kp.key_project_id = kpc.key_project_id AND kpc.delete_enum = 'FALSE' LEFT JOIN camera c ON c.camera_id = kpc.camera_id - left join safety_environmental_inspection sei on kp.key_project_id = sei.key_project_id AND sei.delete_enum = 'FALSE' and sei.status != 0 - left join hidden h on sei.inspection_id = h.foreign_key AND h.delete_enum = 'FALSE' + LEFT JOIN ( + SELECT + key_project_id, + COUNT(DISTINCT id) AS inspectCount, + SUM(IFNULL(hidden_number, 0)) AS hazardCount + FROM safety_environmental_inspection + WHERE delete_enum = 'FALSE' + AND status != 0 + GROUP BY key_project_id + ) sei_stat ON kp.key_project_id = sei_stat.key_project_id where kp.delete_enum = 'FALSE' and kp.apply_status != 0 and kp.jurisdiction_corpinfo_id = #{params.jurisdictionCorpinfoId}