From 96d7f8d803ae9e47daa9141e9efe7d787df7b0c9 Mon Sep 17 00:00:00 2001 From: shihongwei <178899525@qq.com> Date: Tue, 28 Jul 2026 15:56:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E9=9A=90=E6=82=A3=E6=8E=92=E6=9F=A5?= =?UTF-8?q?=E8=AE=A1=E5=88=92):=20=E6=96=B0=E5=A2=9E=E5=BE=85=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E4=BA=BA=E6=95=B0=E7=BB=9F=E8=AE=A1=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=8F=8A=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hiddenDangerPlan/domain/vo/HotHiddenDangerPlanVo.java | 6 ++++++ .../mapper/securityManagement/HotHiddenDangerPlanMapper.xml | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/hotwj/platform/securityManagement/hiddenDangerPlan/domain/vo/HotHiddenDangerPlanVo.java b/src/main/java/com/hotwj/platform/securityManagement/hiddenDangerPlan/domain/vo/HotHiddenDangerPlanVo.java index e37f9b6..75b5a9e 100644 --- a/src/main/java/com/hotwj/platform/securityManagement/hiddenDangerPlan/domain/vo/HotHiddenDangerPlanVo.java +++ b/src/main/java/com/hotwj/platform/securityManagement/hiddenDangerPlan/domain/vo/HotHiddenDangerPlanVo.java @@ -127,5 +127,11 @@ public class HotHiddenDangerPlanVo implements Serializable { @ExcelProperty(value = "未完成数") private Long pendingCount; + /** + * 待审核人数 + */ + @ExcelProperty(value = "待审核人数") + private Long pendingAuditCount; + } diff --git a/src/main/resources/mapper/securityManagement/HotHiddenDangerPlanMapper.xml b/src/main/resources/mapper/securityManagement/HotHiddenDangerPlanMapper.xml index bb4db4d..64d4880 100644 --- a/src/main/resources/mapper/securityManagement/HotHiddenDangerPlanMapper.xml +++ b/src/main/resources/mapper/securityManagement/HotHiddenDangerPlanMapper.xml @@ -21,13 +21,15 @@ p.is_auto_generated_by_backend, p.plan_date_key, COALESCE(stats.completed_count, 0) AS completedCount, - COALESCE(stats.pending_count, 0) AS pendingCount + COALESCE(stats.pending_count, 0) AS pendingCount, + COALESCE(stats.pending_audit_count, 0) AS pendingAuditCount FROM hot_hidden_danger_plan p LEFT JOIN ( SELECT i.plan_id, SUM(CASE WHEN i.status IN (3, 9) THEN 1 ELSE 0 END) AS completed_count, - SUM(CASE WHEN i.status IS NULL OR i.status NOT IN (3, 9) THEN 1 ELSE 0 END) AS pending_count + SUM(CASE WHEN i.status IS NULL OR i.status NOT IN (3, 9) THEN 1 ELSE 0 END) AS pending_count, + SUM(CASE WHEN i.status NOT IN (3, 6, 7, 8, 9, 10) THEN 1 ELSE 0 END) AS pending_audit_count FROM hot_hidden_danger_inspection i WHERE i.is_deleted = 0 GROUP BY i.plan_id