diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java
index 235d6541..5a5b81cf 100644
--- a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java
+++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java
@@ -450,6 +450,23 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
condition.put("TYPE", "2");
// 安全项检查人需处理数
info.put("safetyNum", busHotworkCfdExamineMapper.findByCondition(condition).size());
+ int sumCount = 0;
+ sumCount += Integer.parseInt(info.getString("COUNTBACK", "0"));
+ sumCount += Integer.parseInt(info.getString("COUNTLEADER", "0"));
+ sumCount += Integer.parseInt(info.getString("COUNTMONITOR", "0"));
+ sumCount += Integer.parseInt(info.getString("COUNTACCEPT", "0"));
+ sumCount += Integer.parseInt(info.getString("COUNTAPPROVE", "0"));
+ sumCount += Integer.parseInt(info.getString("COUNTANALYZE", "0"));
+ sumCount += Integer.parseInt(info.getString("safetyNum", "0"));
+ sumCount += Integer.parseInt(info.getString("belongingNum", "0"));
+ sumCount += Integer.parseInt(info.getString("COUNTGUARDIAN", "0"));
+ sumCount += Integer.parseInt(info.getString("confessNum", "0"));
+ sumCount += Integer.parseInt(info.getString("COUNTACCEPTCONFESS", "0"));
+ sumCount += Integer.parseInt(info.getString("COUNTCONFIRM", "0"));
+ sumCount += Integer.parseInt(info.getString("COUNTCONFESS", "0"));
+ sumCount += Integer.parseInt(info.getString("COUNTAUDIT", "0"));
+
+ info.put("SUMCOUNT", sumCount);
// 气体分析人需处理数
return info;
}
diff --git a/src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml b/src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml
index da5034b2..de873929 100644
--- a/src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml
+++ b/src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml
@@ -1350,20 +1350,29 @@
-
diff --git a/src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml b/src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml
index ab53bbf7..4795cc08 100644
--- a/src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml
+++ b/src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml
@@ -1517,16 +1517,25 @@
COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) COUNTAPPROVE,
COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) COUNTACCEPT,
COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.ANALYZE_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) COUNTANALYZE,
- COUNT(CASE WHEN f.APPLY_STATUS < '5' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.ELECTRICITY_ID END) COUNTGUARDIAN,
- COUNT(CASE WHEN f.APPLY_STATUS < '5' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.ELECTRICITY_ID END) COUNTCONFESS,
- COUNT(CASE WHEN f.APPLY_STATUS < '5' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and
- not exists(select 1 from GF_ELECTRICITY_ACCEPTUSER m where m.ELECTRICITY_ID = f.ELECTRICITY_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID)
- THEN f.ELECTRICITY_ID END) COUNTACCEPTCONFESS
+ COUNT(CASE WHEN f.APPLY_STATUS < '5' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.ELECTRICITY_ID END) COUNTGUARDIAN,
+ COUNT(CASE WHEN f.APPLY_STATUS < '5' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.ELECTRICITY_ID END) COUNTCONFESS,
+ COUNT(CASE WHEN f.APPLY_STATUS < '5' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_ELECTRICITY_ACCEPTUSER m where m.ELECTRICITY_ID = f.ELECTRICITY_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.ELECTRICITY_ID END) COUNTACCEPTCONFESS,
+
+ (
+ COUNT(CASE WHEN (f.APPLY_STATUS+0) < 1 AND f.CREATOR = #{USER_ID} THEN f.ELECTRICITY_ID END) +
+ COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.CONFIRM_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) +
+ COUNT(CASE WHEN f.APPLY_STATUS = '2' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) +
+ COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) +
+ COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) +
+ COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.ANALYZE_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) +
+ COUNT(CASE WHEN f.APPLY_STATUS < '5' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.ELECTRICITY_ID END) +
+ COUNT(CASE WHEN f.APPLY_STATUS < '5' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.ELECTRICITY_ID END) +
+ COUNT(CASE WHEN f.APPLY_STATUS < '5' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_ELECTRICITY_ACCEPTUSER m where m.ELECTRICITY_ID = f.ELECTRICITY_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.ELECTRICITY_ID END)
+ ) AS SUMCOUNT
FROM f
WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
-