zcloud_gbs
/
zcloud_gbs_hidden_evaluation
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

隐患考评调整

main
zhaokai 2026-04-01 10:59:58 +08:00
parent 12e517b169
commit 458fd9b6c1
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpHiddenStatisticsCO.java
View File

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

6
web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpHiddenStatisticsDO.java
View File

@ -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;
}

2
web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml
View File

@ -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'