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