From 458fd9b6c1e59bd7179aed1a38dd3af0f5789def Mon Sep 17 00:00:00 2001 From: zhaokai Date: Wed, 1 Apr 2026 10:59:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E6=82=A3=E8=80=83=E8=AF=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluation/dto/clientobject/CorpHiddenStatisticsCO.java | 6 ++++++ .../persistence/dataobject/CorpHiddenStatisticsDO.java | 6 ++++++ .../main/resources/mapper/HiddenEvaluationRecordMapper.xml | 2 ++ 3 files changed, 14 insertions(+) diff --git a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpHiddenStatisticsCO.java b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpHiddenStatisticsCO.java index 893cdb6..bd59659 100644 --- a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpHiddenStatisticsCO.java +++ b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpHiddenStatisticsCO.java @@ -53,6 +53,12 @@ public class CorpHiddenStatisticsCO implements Serializable { @ApiModelProperty(value = "隐患快报-隐患总数") private String hazardReportTotalCount; + @ApiModelProperty(value = "视频巡屏-隐患考评数") + private String videoPatrolEvalCount; + + @ApiModelProperty(value = "视频巡屏-隐患总数") + private String videoPatrolTotalCount; + @ApiModelProperty(value = "消防检查-隐患考评数") private String fireCheckEvalCount; diff --git a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpHiddenStatisticsDO.java b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpHiddenStatisticsDO.java index 079db4d..9c65bf2 100644 --- a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpHiddenStatisticsDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpHiddenStatisticsDO.java @@ -56,6 +56,12 @@ public class CorpHiddenStatisticsDO implements Serializable { @ApiModelProperty(value = "消防检查-隐患总数") private String fireCheckTotalCount; + @ApiModelProperty(value = "视频巡屏-隐患考评数") + private String videoPatrolEvalCount; + + @ApiModelProperty(value = "视频巡屏-隐患总数") + private String videoPatrolTotalCount; + @ApiModelProperty(value = "考评组成员") private String evaluationMembers; } diff --git a/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml index a656935..91cdec1 100644 --- a/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml @@ -26,6 +26,8 @@ COUNT(DISTINCT CASE WHEN h.source = 1 THEN h.hidden_id END) as hazardReportTotalCount, COUNT(DISTINCT CASE WHEN h.source = 6 AND her.evaluation_result != 1 THEN h.hidden_id END) as fireCheckEvalCount, COUNT(DISTINCT CASE WHEN h.source = 6 THEN h.hidden_id END) as fireCheckTotalCount, + COUNT(DISTINCT CASE WHEN h.source = 7 AND her.evaluation_result != 1 THEN h.hidden_id END) as videoPatrolEvalCount, + COUNT(DISTINCT CASE WHEN h.source = 7 THEN h.hidden_id END) as videoPatrolTotalCount, IFNULL(ec_all.evaluationMembers, '') AS evaluationMembers FROM evaluation_config ec left join evaluation_corp ecorp ON ecorp.corpinfo_id = ec.corpinfo_id AND ecorp.delete_enum = 'FALSE'