Merge remote-tracking branch 'origin/20240528Test' into liujun-2024-06-06-相关方新需求

src/main/java/com/zcloud/FHmainApplication.java

@@ -7,6 +7,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.scheduling.annotation.EnableScheduling;
 

src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java

@@ -650,33 +650,33 @@ public class AppHotworkCfdController extends BaseController {
 	 * @param
 	 * @throws Exception
 	 */
-	@RequestMapping(value = "/editAcceptconfess")
+//	@RequestMapping(value = "/editAcceptconfess")
-	@ResponseBody
+//	@ResponseBody
-	@Transactional
+//	@Transactional
-	@LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "修改")
+//	@LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "修改")
-	public Object editAcceptconfess(MultipartRequest request) throws Exception {
+//	public Object editAcceptconfess(MultipartRequest request) throws Exception {
-		Map<String, Object> map = new HashMap<String, Object>();
+//		Map<String, Object> map = new HashMap<String, Object>();
-		String errInfo = "success";
+//		String errInfo = "success";
-		PageData pd = new PageData();
+//		PageData pd = new PageData();
-		pd = this.getPageData();
+//		pd = this.getPageData();
-		PageData pd2 = new PageData();
+//		PageData pd2 = new PageData();
-		pd2 = hotworkCfdService.findById(pd);
+//		pd2 = hotworkCfdService.findById(pd);
-		pd2.put("OPERATOR", pd.get("OPERATOR"));    //修改人
+//		pd2.put("OPERATOR", pd.get("OPERATOR"));    //修改人
-		pd2.put("OPERATTIME", DateUtil.date2Str(new Date()));    //修改时间
+//		pd2.put("OPERATTIME", DateUtil.date2Str(new Date()));    //修改时间
-		List<MultipartFile> fileList = new ArrayList<MultipartFile>();
+//		List<MultipartFile> fileList = new ArrayList<MultipartFile>();
-		String signertime = "";
+//		String signertime = "";
-		String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
+//		String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
-
+//
-		for (int i = 0; i < SIGNTIME.length; i++) {
+//		for (int i = 0; i < SIGNTIME.length; i++) {
-			signertime = SIGNTIME[i];
+//			signertime = SIGNTIME[i];
-			fileList.add(request.getFile("file" + i));
+//			fileList.add(request.getFile("file" + i));
-			MultipartFile[] fileArr = new MultipartFile[fileList.size()];
+//			MultipartFile[] fileArr = new MultipartFile[fileList.size()];
-			saveImg(fileList.toArray(fileArr), signertime, pd.getString("HOTWORK_ID"), pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_CONFESS_USER_ID"), pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"));
+//			saveImg(fileList.toArray(fileArr), signertime, pd.getString("HOTWORK_ID"), pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_CONFESS_USER_ID"), pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"));
-			fileList.clear();
+//			fileList.clear();
-		}
+//		}
-		map.put("result", errInfo);
+//		map.put("result", errInfo);
-		return map;
+//		return map;
-	}
+//	}
 
 	private void saveImg(MultipartFile[] files, String signertime, String HOTWORK_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception {
 		if (files != null && files.length > 0) {
@@ -721,6 +721,7 @@ public class AppHotworkCfdController extends BaseController {
 		pd = this.getPageData();
 		PageData pd2 = new PageData();
 		pd2 = hotworkCfdService.findById(pd);
+
 		pd2.put("OPERATOR", pd.get("OPERATOR"));    //修改人
 		pd2.put("OPERATTIME", DateUtil.date2Str(new Date()));    //修改时间
 		PageData log = new PageData();
@@ -755,6 +756,9 @@ public class AppHotworkCfdController extends BaseController {
 				}
 				pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
 				pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
+				pd2.put("FIRE_COMPLETED", pd.get("FIRE_COMPLETED"));    //动火是否完成
+				pd2.put("SITE_CLEANED", pd.get("SITE_CLEANED"));    //作业现场是否清理
+				pd2.put("NO_REMAINING_EMBERS", pd.get("NO_REMAINING_EMBERS"));    //是否存在遗留火种
 				hotworkCfdService.edit(pd2);
 				log.put("ACTION", "验收通过");
 
@@ -1098,11 +1102,14 @@ public class AppHotworkCfdController extends BaseController {
 			case "7"://班长
 				if (files != null && files.length > 0) {
 					PageData condition = new PageData();
-					condition.put("HOTWORK_ID",pd2.getString("HOTWORK_ID"));
+					pd.put("HOTWORK_ID",pd2.getString("HOTWORK_ID"));
-					List<PageData> acceptUsers = hotworkAcceptUserCfdService.listAll(condition);
+//					condition.put("HOTWORK_ID",pd2.getString("HOTWORK_ID"));
-					if (acceptUsers.size() <= 0){
+					hotworkCfdService.addInfo(pd);
-						map.put("code","9999");
+					//List<PageData> acceptUsers = hotworkAcceptUserCfdService.listAll(condition);
-						map.put("errorMessage","接受交底人未签字");
+					List<PageData> acceptConfessList = (List<PageData>) pd.get("acceptConfessList");
+					if (acceptConfessList == null || acceptConfessList.size() <= 0 || "0".equals(pd.getString("acceptConfessStatus"))) {
+						map.put("code", "9999");
+						map.put("errorMessage", "接受交底人未签字");
 						return map;
 					}
 					MultipartFile file = files[0];
@@ -1659,13 +1666,25 @@ public class AppHotworkCfdController extends BaseController {
 		map.put("measuresList", hotworkCfdService.listAllMeasures(condition));
 
 		pd = hotworkCfdService.findById(pd);	//根据ID读取
+
 		// created by liu jun 添加（交底人、项目主管部门负责人、安全措施确认人）
 		hotworkCfdService.addInfo(pd);
 
 		map.put("gasList", hotworkGasCfdService.listAll(pd));
 		// imgList是接受交底人签字
-		map.put("imgList", hotworkAcceptUserCfdService.findByIds(pd));
+		List<PageData> acceptConfessList = (List<PageData>) pd.get("acceptConfessList");
-		map.put("imgList1", hotworkAcceptUserCfdService.findById(pd));
+		List<String> imgList = new ArrayList<>();
+		if (acceptConfessList != null) {
+			for (PageData acceptConfess : acceptConfessList) {
+				String signerPath = acceptConfess.getString("ACCEPT_CONFESS_USER_SIGNER_PATH");
+				if (signerPath != null && !signerPath.isEmpty()) {
+					imgList.add(signerPath);
+				}
+			}
+		}
+		map.put("imgList", imgList);
+//		map.put("imgList", hotworkAcceptUserCfdService.findByIds(pd));
+//		map.put("imgList1", hotworkAcceptUserCfdService.findById(pd));
 		condition.clear();
 		condition.put("TYPE","115");
 		condition.put("FOREIGN_KEY",pd.getString("HOTWORK_ID"));
@@ -1846,6 +1865,36 @@ public class AppHotworkCfdController extends BaseController {
 		}
 	}
 
+	/**
+	 * 接受交底人审批
+	 * @param files
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/editAcceptconfess")
+	@ResponseBody
+	public Object editAcceptconfess(@RequestParam(value = "FFILE", required = false) MultipartFile[] files) throws Exception {
+		PageData response = new PageData();
+		try {
+			PageData request = this.getPageData();
+			PageData condition = new PageData();
+			condition.put("HOTWORK_ID",request.get("HOTWORK_ID"));
+			condition.put("USER_ID",request.get("USER_ID"));
+			condition.put("CORPINFO_ID",request.get("CORPINFO_ID"));
+			condition.put("TYPE","3");
+			condition.put("APPROVAL_STATUS","1");
+			hotworkCfdService.confessApproval(condition, files);
+			response.put("result", "success");
+			return response;
+		} catch (Exception e) {
+			e.printStackTrace();
+			response.put("result", "error");
+			response.put("message", e.getMessage());
+			return response;
+		}
+	}
+
+
 	/**
 	 * 安全交底人审批
 	 * created by liu jun

src/main/java/com/zcloud/controller/system/LoginController.java

@@ -187,7 +187,7 @@ public class LoginController extends BaseController {
                         PageData pathData = corpPathService.getCorpPathByCorpId(pd);
                         map.put("baseImgPath",pathData.getString("PIC_PATH"));
                         map.put("USER_IDENTITY",pathData.getString("USER_IDENTITY"));
-                        map.put("BACKENDADDR", pathData.getString("BACK_END_PATH"));
+                        map.put("BACKENDADDR", "http://192.168.0.49:8091/");
                     } else {
                         PageData pathData = corpPathService.getCorpPathByPersonInfo(pd);
                         map.put("baseImgPath",pathData.getString("PIC_PATH"));

src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkCfdMapper.java

@@ -85,5 +85,8 @@ public interface HotworkCfdMapper {
 	PageData countCheck(PageData pd);
 
     PageData getCode(PageData pd);
+
+	List<PageData> datalistPageHistory(Page page);
+
 }
 

src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java

@@ -65,6 +65,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
 	@Transactional
 	public void saveConfess(PageData info) throws Exception{
 		List<PageData> list = Warden.getList(info.getString("confessList"));
+		List<PageData> listAccept = Warden.getList(info.getString("acceptconfessList"));
 		String flowsId = Warden.get32UUID();
 		String time = DateUtil.getTime();
 		PageData condition = new PageData();
@@ -80,7 +81,27 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
 			entity.put("DEPARTMENT_NAME", x.get("CONFESS_DEPARTMENT_NAME"));
 			this.getCorpInfo(entity);
 			entity.put("TYPE", "0");
-			entity.put("TYPE_NAME", "动火交底人");
+			entity.put("TYPE_NAME", "安全交底人");
+			entity.put("APPROVAL_OPINIONS",info.getString("CONFESS_DEPARTMENT_OPINIONS"));
+			entity.put("APPROVAL_STATUS", "0");
+			entity.put("STATUS", "0");
+			entity.put("CREATE_TIME", time);
+			entity.put("VALID_FLAG", "1");
+			entity.put("IS_DELETE", "0");
+			busHotworkCfdExamineMapper.save(entity);
+		}
+		for (PageData x : listAccept) {
+			PageData entity = new PageData();
+			entity.put("HOTWORK_EXAMINE_ID", Warden.get32UUID());
+			entity.put("HOTWORK_ID", info.getString("HOTWORK_ID"));
+			entity.put("FLOW_ID", flowsId);// 流程id
+			entity.put("USER_ID", x.get("ACCEPT_CONFESS_USER_ID"));
+			entity.put("USER_NAME", x.get("ACCEPT_CONFESS_USER_NAME"));
+			entity.put("DEPARTMENT_ID", x.get("ACCEPT_CONFESS_DEPARTMENT_ID"));
+			entity.put("DEPARTMENT_NAME", x.get("ACCEPT_CONFESS_DEPARTMENT_NAME"));
+			this.getCorpInfo(entity);
+			entity.put("TYPE", "3");
+			entity.put("TYPE_NAME", "接受交底人");
 			entity.put("APPROVAL_OPINIONS",info.getString("CONFESS_DEPARTMENT_OPINIONS"));
 			entity.put("APPROVAL_STATUS", "0");
 			entity.put("STATUS", "0");
@@ -309,13 +330,32 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
 	 * @param page
 	 * @throws Exception
 	 */
-	public List<PageData> list(Page page)throws Exception{
+	public List<PageData> list(Page page) throws Exception {
 		List<PageData> list = hotworkCfdMapper.datalistPage(page);
-		// created by liu jun 2024/02/03 description: 拼接动火交底人、项目主管部门、安全项检查人
+		String applyStatus = page.getPd().getString("APPLY_STATUS");
-		for(PageData dto: list){
+
+		for (PageData dto : list) {
+
+			page.getPd().put("HOTWORK_ID", dto.getString("HOTWORK_ID"));
+
+			if ("1".equals(applyStatus) || "1.5".equals(applyStatus) || "2".equals(applyStatus)) {
+				List<PageData> historyList = hotworkCfdMapper.datalistPageHistory(page);
+				if (historyList != null && !historyList.isEmpty()) {
+					for (PageData historyPd : historyList) {
+						if (historyPd.getString("HOTWORK_ID").equals(dto.getString("HOTWORK_ID"))) {
+							dto.put("historyPd", historyPd);
+							break;
+						}
+					}
+				}
+			}
+
 			this.addInfo(dto);
 		}
-		return list;
+
+		return list.stream()
+				.sorted((o1, o2) -> o2.getString("CREATTIME").compareTo(o1.getString("CREATTIME")))
+				.collect(Collectors.toList());
 	}
 	public List<PageData> jhlist(Page page)throws Exception{
 		return hotworkCfdMapper.jhdatalistPage(page);
@@ -413,6 +453,9 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
 		condition.put("isValid","1");
 		//动火交底人需处理数
 		info.put("confessNum", busHotworkCfdExamineMapper.findByCondition(condition).size());
+		//接受交底人需处理数
+		condition.put("TYPE", "3");
+		info.put("acceptConfessNum", busHotworkCfdExamineMapper.findByCondition(condition).size());
 		condition.put("TYPE", "1");
 		// 项目主管部门需处理数
 		List<PageData> _belongingList = busHotworkCfdExamineMapper.findByCondition(condition);
@@ -431,6 +474,24 @@ 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"));
+		sumCount += Integer.parseInt(info.getString("acceptConfessNum", "0"));
+
+		info.put("SUMCOUNT", sumCount);
 		// 气体分析人需处理数
 		return info;
 	}
@@ -465,7 +526,32 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
 			}else {
 				pd.put("confessStatus", "1");
 			}
-
+			//接受交底人
+			List<PageData> acceptConfess = approvalInfos.stream()
+					.filter(x -> "3".equals(x.getString("TYPE")))
+					.collect(Collectors.toList());
+			for (PageData x : acceptConfess) {
+				x.put("ACCEPT_CONFESS_USER_ID", x.get("USER_ID"));
+				x.put("ACCEPT_CONFESS_USER_NAME", x.get("USER_NAME"));
+				x.put("ACCEPT_CONFESS_DEPARTMENT_ID", x.get("DEPARTMENT_ID"));
+				x.put("ACCEPT_CONFESS_DEPARTMENT_NAME", x.get("DEPARTMENT_NAME"));
+				x.put("ACCEPT_CONFESS_USER_SIGNER_PATH", x.get("APPROVAL_SIGNATURE"));
+			}
+			pd.put("acceptConfessUserNames", acceptConfess.stream().map(x -> x.getString("USER_NAME")).collect(Collectors.joining(",")));
+			pd.put("acceptConfessList", acceptConfess);
+			if (acceptConfess.stream().anyMatch(x -> "0".equals(x.getString("APPROVAL_STATUS")))){
+				pd.put("acceptConfessStatus", "0");
+			}else {
+				pd.put("acceptConfessStatus", "1");
+			}
+			//安全措施数据
+			List<PageData> safetyList  = approvalInfos.stream()
+					.filter(x -> "2".equals(x.getString("TYPE")))
+					.collect(Collectors.toList());
+			for (PageData x : safetyList) {
+				x.put("APPROVAL_STATUS", x.get("APPROVAL_STATUS"));
+			}
+			pd.put("safetyList", safetyList);
 			// 项目责任负责人
 			PageData belong = approvalInfos.stream().filter(x -> "1".equals(x.getString("TYPE"))).findFirst().orElse(null);
 			pd.put("BELONGING_USER_ID", belong.getString("USER_ID"));

src/main/resources/application-local.properties

@@ -2,12 +2,12 @@
 
 datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
 datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
-datasource.no1.username=root
+datasource.no1.username=dev
-datasource.no1.password=Mysql@zcloud88888
+datasource.no1.password=Zykj@dev123456
 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
 datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
-datasource.no2.username=root
+datasource.no2.username=dev
-datasource.no2.password=Mysql@zcloud88888
+datasource.no2.password=Zykj@dev123456
 
 
 #druid???
@@ -62,19 +62,30 @@ spring.main.banner-mode=off
 #qa-regulatory-gwj.api.url=http://192.168.0.79:8008
 preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/
 qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/
+
+baseimgpath =http://192.168.192.201:8991/file/
+
+heBeiQinAnFile=https://file.zcloudchina.com/YTHFile
+
+dw.url=http://192.168.192.201:8888/qa-dingWei-gwj/
 #?????
-smb.host=192.168.192.201
+#smb.host=192.168.192.201
+#smb.port=22
+#smb.user=root
+#smb.password=SJSKAQHBGLXT@20220311
+#smb.basePath=/mnt/qask/file/
+smb.host=39.101.130.96
 smb.port=22
 smb.user=root
-smb.password=SJSKAQHBGLXT@20220311
+smb.password=Zcloud@zcloud88888
-smb.basePath=/mnt/qask/file/
+smb.basePath=/mnt/wwag/file/
 
 #Mq\u914D\u7F6E
 rocketmq.consumer.group2=edu-admin-edit
 rocketmq.consumer.group1=edu-admin-add
 #rocketmq.name-server=10.0.140.141:9876
 #rocketmq.name-server=192.168.0.70:9876
-rocketmq.name-server=192.168.151.57:9876
+rocketmq.name-server=39.100.115.58:8899
 rocketmq.producer.group=libmiddle
 rocketmq.producer.send-message-timeout=3000
 rocketmq.producer.compress-message-body-threshold=4096
@@ -88,6 +99,8 @@ mq.topic.info=info
 mq.topic.eightWork=eightWork
 mq.group.info=scheduled_tasks
 mq.group.eightWork=scheduled_tasks_eightWork
+mq.gwj.data.topic=czks_docking
+mq.gwj.file.topic=czks_dockingPicture
 
 
 corp.default.pic-path=https://qgqy.qhdsafety.com/

src/main/resources/application-master.properties

@@ -1,12 +1,12 @@
 # ??????
 datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
-datasource.no1.url=jdbc:mysql://192.168.192.202:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
+datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
 datasource.no1.username=root
-datasource.no1.password=gwjsjkzcloud888888
+datasource.no1.password=Mysql@zcloud88888
 datasource.no2.driver-class-name:  com.mysql.cj.jdbc.Driver
-datasource.no2.url=jdbc:mysql://192.168.192.202:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
+datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
 datasource.no2.username=root
-datasource.no2.password=gwjsjkzcloud888888
+datasource.no2.password=Mysql@zcloud88888
 
 #druid连接池
 spring.datasource.type: com.alibaba.druid.pool.DruidDataSource

src/main/resources/application.properties

@@ -2,11 +2,11 @@ spring.application.name=qa-prevention-gwj
 server.port=8091
 
 #??
-#spring.profiles.active=local
+spring.profiles.active=local
 #<23><><EFBFBD><EFBFBD>31ʱʹ<CAB1><CAB9>
 #spring.profiles.active=dev
 #??
-spring.profiles.active=master
+#spring.profiles.active=master
 
 
 

src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml

@@ -1350,20 +1350,29 @@
 	<!-- 待办作业数 -->
 	<select id="countCheck" parameterType="pd" resultType="pd">
 		SELECT
-		COUNT(CASE WHEN (f.APPLY_STATUS+0) &lt; 1 AND f.CREATOR = #{USER_ID} THEN f.BLINDBOARD_ID END) COUNTBACK,
+		COUNT(CASE WHEN (f.APPLY_STATUS + 0) &lt; 1 AND f.CREATOR = #{USER_ID} THEN f.BLINDBOARD_ID END) COUNTBACK,
 		COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.CONSTRUCTION_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END) COUNTCONSTRUCTION,
 		COUNT(CASE WHEN f.APPLY_STATUS = '2' AND f.PRODUCTION_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END) COUNTPRODUCTION,
 		COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.SAFETY_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END) COUNTSAFETY,
 		COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.LEADER_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END) COUNTLEADER,
 		COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END) COUNTACCEPT,
-		COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.BLINDBOARD_ID END) COUNTGUARDIAN,
+		COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN f.BLINDBOARD_ID END) COUNTGUARDIAN,
-
+		COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN f.BLINDBOARD_ID END) COUNTCONFESS,
-		COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.BLINDBOARD_ID END) COUNTCONFESS,
+		COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} AND NOT EXISTS (SELECT 1 FROM GF_BLINDBOARD_ACCEPTUSER m WHERE m.BLINDBOARD_ID = f.BLINDBOARD_ID AND m.CORPINFO_ID = f.CORPINFO_ID AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.BLINDBOARD_ID END) COUNTACCEPTCONFESS,
-		COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_BLINDBOARD_ACCEPTUSER m where m.BLINDBOARD_ID = f.BLINDBOARD_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID)  THEN f.BLINDBOARD_ID END) COUNTACCEPTCONFESS
+		(
+		COUNT(CASE WHEN (f.APPLY_STATUS + 0) &lt; 1 AND f.CREATOR = #{USER_ID} THEN f.BLINDBOARD_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.CONSTRUCTION_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS = '2' AND f.PRODUCTION_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.SAFETY_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.LEADER_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS &lt;'6' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN f.BLINDBOARD_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS &lt;'6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN f.BLINDBOARD_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS &lt;'6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} AND NOT EXISTS (SELECT 1 FROM GF_BLINDBOARD_ACCEPTUSER m WHERE m.BLINDBOARD_ID = f.BLINDBOARD_ID AND m.CORPINFO_ID = f.CORPINFO_ID AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.BLINDBOARD_ID END)
+		) AS SUMCOUNT
 		FROM <include refid="tableName"></include> f
 		WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
 	</select>
-
 	<!-- 获取编码 -->
 	<select id="getCode" parameterType="pd" resultType="pd">
 		SELECT

src/main/resources/mybatis/datasource/gf/ConfinedSpaceMapper.xml

@@ -1453,9 +1453,22 @@
 		COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END) COUNTAUDIT,
 		COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END) COUNTAPPROVE,
 		COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END) COUNTACCEPT,
-		COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.ANALYZE_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END) COUNTANALYZE,
+		COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.ANALYZE_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END) COUNTANALYZE,
-		COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.CONFINEDSPACE_ID END) COUNTCONFESS,
+		COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.CONFINEDSPACE_ID END) COUNTCONFESS,
-		COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and  not exists(select 1 from GF_CONFINEDSPACE_ACCEPTUSER m where m.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.CONFINEDSPACE_ID END) COUNTACCEPTCONFESS
+		COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_CONFINEDSPACE_ACCEPTUSER m where m.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.CONFINEDSPACE_ID END) COUNTACCEPTCONFESS,
+
+		(
+		COUNT(CASE WHEN (f.APPLY_STATUS+0) < 1 AND f.CREATOR = #{USER_ID} THEN f.CONFINEDSPACE_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.CONFIRM_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.CONFINEDSPACE_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.ANALYZE_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.CONFINEDSPACE_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_CONFINEDSPACE_ACCEPTUSER m where m.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.CONFINEDSPACE_ID END)
+		) AS SUMCOUNT
+
 		FROM <include refid="tableName"></include> f
 		WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
 	</select>

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.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.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
+		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,
-		  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 <include refid="tableName"></include> f
 		WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
 	</select>
-
 	<!-- 获取编码 -->
 	<select id="getCode" parameterType="pd" resultType="pd">
 		SELECT

src/main/resources/mybatis/datasource/gf/HighWorkMapper.xml

@@ -1354,19 +1354,30 @@
 	<!-- 待办作业数 -->
 	<select id="countCheck" parameterType="pd" resultType="pd">
 		SELECT
-		COUNT(CASE WHEN (f.APPLY_STATUS+0) &lt; 1 AND f.CREATOR = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTBACK,
+		COUNT(CASE WHEN (f.APPLY_STATUS + 0) &lt; 1 AND f.CREATOR = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTBACK,
 		COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.CONSTRUCTION_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTCONSTRUCTION,
 		COUNT(CASE WHEN f.APPLY_STATUS = '2' AND f.LEADER_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTLEADER,
 		COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTAUDIT,
 		COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTAPPROVE,
 		COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTACCEPT,
-		COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.HIGHWORK_ID END) COUNTGUARDIAN,
+		COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN f.HIGHWORK_ID END) COUNTGUARDIAN,
-		COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.HIGHWORK_ID END) COUNTCONFESS,
+		COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN f.HIGHWORK_ID END) COUNTCONFESS,
-		COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_HIGHWORK_ACCEPTUSER m where m.HIGHWORK_ID = f.HIGHWORK_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.HIGHWORK_ID END) COUNTACCEPTCONFESS
+		COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} AND NOT EXISTS (SELECT 1 FROM GF_HIGHWORK_ACCEPTUSER m WHERE m.HIGHWORK_ID = f.HIGHWORK_ID AND m.CORPINFO_ID = f.CORPINFO_ID AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.HIGHWORK_ID END) COUNTACCEPTCONFESS,
+		-- 求和所有计数项
+		(
+		COUNT(CASE WHEN (f.APPLY_STATUS + 0) &lt; 1 AND f.CREATOR = #{USER_ID} THEN f.HIGHWORK_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.CONSTRUCTION_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS = '2' AND f.LEADER_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN f.HIGHWORK_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN f.HIGHWORK_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} AND NOT EXISTS (SELECT 1 FROM GF_HIGHWORK_ACCEPTUSER m WHERE m.HIGHWORK_ID = f.HIGHWORK_ID AND m.CORPINFO_ID = f.CORPINFO_ID AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.HIGHWORK_ID END)
+		) AS SUMCOUNT
 		FROM <include refid="tableName"></include> f
 		WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
 	</select>
-
 	<!-- 获取编码 -->
 	<select id="getCode" parameterType="pd" resultType="pd">
 		SELECT

src/main/resources/mybatis/datasource/gf/HoistingMapper.xml

@@ -1361,13 +1361,25 @@
 		COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.HOISTING_ID END) COUNTAUDIT,
 		COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.HOISTING_ID END) COUNTAPPROVE,
 		COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.HOISTING_ID END) COUNTACCEPT,
-		COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.HOISTING_ID END) COUNTGUARDIAN,
+		COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.HOISTING_ID END) COUNTGUARDIAN,
-		COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.HOISTING_ID END) COUNTCONFESS,
+		COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.HOISTING_ID END) COUNTCONFESS,
-		COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and  not exists(select 1 from GF_HOISTING_ACCEPTUSER m where m.HOISTING_ID = f.HOISTING_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.HOISTING_ID END) COUNTACCEPTCONFESS
+		COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_HOISTING_ACCEPTUSER m where m.HOISTING_ID = f.HOISTING_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.HOISTING_ID END) COUNTACCEPTCONFESS,
+
+		(
+		COUNT(CASE WHEN (f.APPLY_STATUS+0) < 1 AND f.CREATOR = #{USER_ID} THEN f.HOISTING_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.LEADER_USER_ID = #{USER_ID} THEN f.HOISTING_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS = '2' AND f.CONSTRUCTION_USER_ID = #{USER_ID} THEN f.HOISTING_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.HOISTING_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.HOISTING_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.HOISTING_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.HOISTING_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.HOISTING_ID END) +
+		COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_HOISTING_ACCEPTUSER m where m.HOISTING_ID = f.HOISTING_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.HOISTING_ID END)
+		) AS SUMCOUNT
+
 		FROM <include refid="tableName"></include> f
 		WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
 	</select>
-
 	<!-- 获取编码 -->
 	<select id="getCode" parameterType="pd" resultType="pd">
 		SELECT

src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml

@@ -359,6 +359,9 @@
 			ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH},
 			ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME},
 			CONFIRM_OTHER_CONTENT = #{CONFIRM_OTHER_CONTENT},
+			FIRE_COMPLETED = #{FIRE_COMPLETED},
+			SITE_CLEANED = #{SITE_CLEANED},
+			NO_REMAINING_EMBERS = #{NO_REMAINING_EMBERS},
 			HOTWORK_ID = HOTWORK_ID
 		where
 			HOTWORK_ID = #{HOTWORK_ID}
@@ -474,6 +477,9 @@
 		f.OPERATTIME,
 		f.OPERATOR,
 		f.CHECK_NO,
+		f.FIRE_COMPLETED,
+		f.SITE_CLEANED,
+		f.NO_REMAINING_EMBERS,
 		f.WORK_CONTENT,
 		f.WORK_START_DATE,
 		f.WORK_END_DATE,
@@ -490,7 +496,6 @@
 		f.APPROVE_USER_SIGNER_PATH,
 		f.APPROVE_USER_SIGNER_TIME,
 		f.APPLY_STATUS,
-		<!--(SELECT a.ANALYZE_TIME from bus_hotworkgas a where a.ISDELETE = '0'-->
 		(SELECT a.ANALYZE_TIME from bus_hotworkgas_cfd a where a.ISDELETE = '0'
 		AND a.HOTWORK_ID = #{HOTWORK_ID}
 		ORDER BY
@@ -578,7 +583,13 @@
 		aacu.NAME as ACCEPT_CONFESS_USER_NAME,
 
 		anad.NAME as ANALYZE_DEPARTMENT_NAME,
-		anau.NAME as ANALYZE_USER_NAME
+		anau.NAME as ANALYZE_USER_NAME,
+
+		bhe.USER_NAME as EXAMINE_USER_NAME,
+		bhe.APPROVAL_OPINIONS as EXAMINE_APPROVAL_OPINIONS,
+		bhe.APPROVAL_SIGNATURE as EXAMINE_APPROVAL_SIGNATURE,
+		bhe.CREATE_TIME as EXAMINE_APPROVAL_CREATE_TIME
+
 		from
 		<include refid="tableName"></include> f
 		left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID
@@ -614,8 +625,10 @@
 		left join OA_DEPARTMENT anad on anad.DEPARTMENT_ID = f.ANALYZE_DEPARTMENT_ID
 		left join SYS_USER anau on anau.USER_ID = f.ANALYZE_USER_ID
 
+		left join bus_hotwork_cfd_examine bhe on bhe.HOTWORK_ID = f.HOTWORK_ID and bhe.TYPE = 1
+
 		where
-			f.HOTWORK_ID = #{HOTWORK_ID}
+		f.HOTWORK_ID = #{HOTWORK_ID}
 	</select>
 
 	<!-- 列表 -->
@@ -780,9 +793,9 @@
 		    and bhac.ACCEPT_USER_ID = f.ACCEPT_USER_ID and bhac.CORPINFO_ID = f.CORPINFO_ID
 			and bhac.ISDELETE = '0' and bhac.ACCEPT_USER_ID is not null and trim(bhac.ACCEPT_USER_ID) != ''
 		where f.ISDELETE = '0'
-        <if test="pd.APPLY_STATUS != null and pd.APPLY_STATUS != ''">
+<!--        <if test="pd.APPLY_STATUS != null and pd.APPLY_STATUS != ''">-->
-            and f.APPLY_STATUS = #{pd.APPLY_STATUS}
+<!--            and f.APPLY_STATUS = #{pd.APPLY_STATUS}-->
-        </if>
+<!--        </if>-->
 		<if test="pd.IS_GAS != null and pd.IS_GAS != ''">
 			and f.APPLY_STATUS in ('1','2','4','5','6','0.9','2.5','1.5')
 		</if>
@@ -1725,4 +1738,23 @@
 		and f.CREATTIME LIKE CONCAT(#{CREATDATE},'%')
 	</select>
 
+	<select id="datalistPageHistory" resultType="com.zcloud.entity.PageData"
+			parameterType="com.zcloud.entity.Page">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		WHERE f.ISDELETE = '0'
+		<if test="pd.CONFIRM_USER_ID != null">
+			and f.CONFIRM_USER_ID = #{pd.CONFIRM_USER_ID}
+		</if>
+		<if test="pd.BELONGING_USER_ID != null">
+			and f.CONFIRM_USER_ID = #{pd.BELONGING_USER_ID}
+		</if>
+		<if test="pd.LEADER_USER_ID != null">
+			and f.CONFIRM_USER_ID = #{pd.LEADER_USER_ID}
+		</if>
+		and f.HOTWORK_ID = #{pd.HOTWORK_ID}
+	</select>
+
 </mapper>