一公司动火作业地图bug修复

src/main/java/com/zcloud/controller/highriskwork/HotworkCfdController.java

@@ -4,6 +4,7 @@ import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.logs.LogAnno;
+import com.zcloud.service.bus.ImgFilesService;
 import com.zcloud.service.highriskwork.HotworkAcceptUserCfdService;
 import com.zcloud.service.highriskwork.HotworkCfdService;
 import com.zcloud.service.highriskwork.HotworkGasCfdService;
@@ -37,7 +38,9 @@ public class HotworkCfdController extends BaseController {
 	@Autowired
 	private HotworkGasCfdService hotworkGasCfdService;
 	@Autowired
-	private HotworkAcceptUserCfdService hotworkacceptuserCfdService;
+	private HotworkAcceptUserCfdService hotworkAcceptUserCfdService;
+	@Autowired
+	private ImgFilesService imgFilesService;
 	/**新增
 	 * @param
 	 * @throws Exception
@@ -134,12 +137,26 @@ public class HotworkCfdController extends BaseController {
 		String errInfo = "success";
 		PageData pd = new PageData();
 		pd = this.getPageData();
+
+		PageData condition = new PageData();
+		condition.put("showInfo",pd.getString("showInfo"));
+		condition.put("HOTWORK_ID",pd.getString("HOTWORK_ID"));
+		map.put("measuresList", hotworkCfdService.listAllMeasures(condition));
+
 		pd = hotworkCfdService.findById(pd);	//根据ID读取
-		map.put("pd", pd);
+		// created by liu jun 添加（交底人、项目主管部门负责人、安全措施确认人）
+		hotworkCfdService.addInfo(pd);
+
 		map.put("measuresList", hotworkCfdService.listAllMeasures(pd));
 		map.put("gasList", hotworkGasCfdService.listAll(pd));
-		map.put("imgList", hotworkacceptuserCfdService.findByIds(pd));
+		// imgList是接受交底人签字
-		map.put("imgList1", hotworkacceptuserCfdService.findById(pd));
+		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"));
+		map.put("imgList2",imgFilesService.listAll(condition));
+		map.put("pd", pd);
 		map.put("result", errInfo);
 		return map;
 	}

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

@@ -12,6 +12,7 @@ import com.zcloud.service.bus.NoticeCorpUtil;
 import com.zcloud.service.highriskwork.HotworkCfdService;
 import com.zcloud.util.DateUtil;
 import com.zcloud.util.Jurisdiction;
+import com.zcloud.util.Tools;
 import com.zcloud.util.Warden;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -445,7 +446,10 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
 		List<PageData> approvalInfos = busHotworkCfdExamineMapper.findByCondition(condition);
 		if(approvalInfos != null && approvalInfos.size() > 0) {
 			// 动火交底人
-			List<PageData> confess = approvalInfos.stream().filter(x -> "0".equals(x.getString("TYPE"))).collect(Collectors.toList());
+			List<PageData> confess = approvalInfos.stream()
+					.filter(x -> "0".equals(x.getString("TYPE")))
+					.filter(x -> Tools.notEmpty(x.getString("APPROVAL_SIGNATURE_TIME")))
+					.collect(Collectors.toList());
 			for (PageData x : confess) {
 				x.put("CONFESS_USER_ID", x.get("USER_ID"));
 				x.put("CONFESS_USER_NAME", x.get("USER_NAME"));

src/main/java/com/zcloud/service/map/impl/MapEightCfdServiceImpl.java

@@ -2,6 +2,7 @@ package com.zcloud.service.map.impl;
 
 import com.zcloud.entity.PageData;
 import com.zcloud.mapper.datasource.map.MapEightMapper;
+import com.zcloud.service.bus.ImgFilesService;
 import com.zcloud.service.highriskwork.HotworkAcceptUserCfdService;
 import com.zcloud.service.highriskwork.HotworkCfdService;
 import com.zcloud.service.highriskwork.HotworkGasCfdService;
@@ -33,6 +34,8 @@ public class MapEightCfdServiceImpl implements MapEightCfdService {
 	private HotworkGasCfdService hotworkGasCfdService;
 	@Autowired
 	private HotworkAcceptUserCfdService hotworkacceptuserCfdService;
+	@Autowired
+	private ImgFilesService imgFilesService;
 
 	@Override
 	public List<PageData> listAll(PageData pd) {
@@ -56,10 +59,19 @@ public class MapEightCfdServiceImpl implements MapEightCfdService {
 			pd.put("HOTWORKAPPLICATION_ID",idStr);
 			pd = hotworkCfdService.findById(pd);	//根据ID读取
 			map.put("pd", pd);
-			map.put("measuresList", hotworkCfdService.listAllMeasures(pd));
+			PageData condition = new PageData();
+			condition.put("showInfo",pd.getString("showInfo"));
+			condition.put("HOTWORK_ID",pd.getString("HOTWORK_ID"));
+			map.put("measuresList", hotworkCfdService.listAllMeasures(condition));
 			map.put("gasList", hotworkGasCfdService.listAll(pd));
 			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"));
+			map.put("imgList2",imgFilesService.listAll(condition));
+			// created by liu jun 添加（交底人、项目主管部门负责人、安全措施确认人）
+			hotworkCfdService.addInfo(pd);
 		}else if(StringUtils.equals(typeStr,"ELECTRICITY")){
 			//用电作业√
 //			pd.put("ELECTRICITY_ID",idStr);

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

@@ -887,7 +887,8 @@
 		f.APPLY_STATUS
 		WHEN 0 THEN '动火作业待提交'
 		WHEN 1 THEN '作业负责人待审核'
-		WHEN 2 THEN '所在单位待审核'
+		WHEN 1.5 THEN '项目主管部门待审核'
+		WHEN 2 THEN '属地监管单位待审核'
 		WHEN 4 THEN '安全管理部门待审核'
 		WHEN 5 THEN '动火审批人待审核'
 		WHEN 6 THEN '班长待验票'
@@ -930,6 +931,11 @@
 		GROUP_CONCAT(
 		REPLACE ( u6.NAME, '/', ',' )),
 		IFNULL( qu6.`NAME`, '' ))
+		WHEN f.APPLY_STATUS = 1.5 THEN
+		IFNULL(
+		GROUP_CONCAT(
+		REPLACE ( u7.NAME, '/', ',' )),
+		IFNULL( qu7.`NAME`, '' ))
 		ELSE
 		IFNULL(
 		GROUP_CONCAT(
@@ -951,6 +957,10 @@
 		LEFT JOIN `qa-gwj-regulatory`.sys_user qu5 ON qu5.USER_ID = f.MONITOR_USER_ID
 		LEFT JOIN sys_user u6 ON u6.USER_ID = f.ACCEPT_USER_ID
 		LEFT JOIN `qa-gwj-regulatory`.sys_user qu6 ON qu6.USER_ID = f.ACCEPT_USER_ID
+		<!--项目主管部门负责人-->
+		LEFT JOIN bus_hotwork_cfd_examine bhce ON bhce.HOTWORK_ID = f.HOTWORK_ID AND bhce.IS_DELETE = '0' AND bhce.TYPE = '1'
+		LEFT JOIN sys_user u7 ON u7.USER_ID = bhce.USER_ID
+		LEFT JOIN `qa-gwj-regulatory`.sys_user qu7 ON qu7.USER_ID = bhce.USER_ID
 		WHERE
 		f.ISDELETE = '0'
 		AND f.APPLY_STATUS >= 0

src/main/resources/mybatis/datasource/map/MapEightMapper.xml

@@ -326,8 +326,10 @@
 		'动火作业待提交'
 		WHEN 1 THEN
 		'作业负责人待审核'
+		WHEN 1.5 THEN
+		'项目负责人待审核'
 		WHEN 2 THEN
-		'所在单位待审核'
+		'属地监管单位待审核'
 		WHEN 4 THEN
 		'安全管理部门待审核'
 		WHEN 5 THEN