diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java index 6bcbadef..688905fe 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java @@ -1408,11 +1408,16 @@ public class AppHotworkCfdController extends BaseController { pd = hotworkCfdService.findById(pd); //根据ID读取 // created by liu jun 添加(交底人、项目主管部门负责人、安全措施确认人) hotworkCfdService.addInfo(pd); - map.put("measuresList", hotworkCfdService.listAllMeasures(pd)); + PageData condition = new PageData(); + condition.putAll(pd); + if ("0.9".equals(condition.getString("APPLY_STATUS"))){ + condition.put("APPLY_STATUS","1"); + } + map.put("measuresList", hotworkCfdService.listAllMeasures(condition)); map.put("gasList", hotworkGasCfdService.listAll(pd)); map.put("imgList", hotworkAcceptUserCfdService.findByIds(pd)); map.put("imgList1", hotworkAcceptUserCfdService.findById(pd)); - PageData condition = new PageData(); + condition.clear(); condition.put("TYPE","115"); condition.put("FOREIGN_KEY",pd.getString("HOTWORK_ID")); map.put("imgList2",imgFilesService.listAll(condition)); @@ -1482,7 +1487,6 @@ public class AppHotworkCfdController extends BaseController { */ @RequestMapping(value="/countCheck") @ResponseBody - @LogAnno(menuType= "手机",menuServer= "动火作业",instructionsOperate = "动火作业",instructionsType = "待办作业数统计") public Object countCheck() throws Exception{ Map map = new HashMap(); String errInfo = "success"; 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 a5801768..21f21106 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java @@ -342,7 +342,24 @@ public class HotworkCfdServiceImpl implements HotworkCfdService { */ @Override public PageData countCheck(PageData pd) throws Exception { - return hotworkCfdMapper.countCheck(pd); + PageData info = hotworkCfdMapper.countCheck(pd); + // created by liu jun 2024/02/01 description: 获取动火交底人需处理书、项目主管部门、安全项检查人 + PageData condition = new PageData(); + condition.put("IS_DELETE", "0"); + condition.put("VALID_FLAG", "1"); + condition.put("TYPE", "0"); + condition.put("USER_ID", pd.get("USER_ID")); + condition.put("APPROVAL_STATUS", "0"); + busHotworkCfdExamineMapper.findByCondition(condition); + //动火交底人需处理数 + info.put("confessNum", busHotworkCfdExamineMapper.findByCondition(condition).size()); + condition.put("TYPE", "1"); + // 项目主管部门需处理数 + info.put("belongingNum", busHotworkCfdExamineMapper.findByCondition(condition).size()); + condition.put("TYPE", "2"); + // 安全项检查人需处理数 + info.put("safetyNum", busHotworkCfdExamineMapper.findByCondition(condition).size()); + return info; } @Override diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml index 213783e9..22372bfb 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml @@ -1649,10 +1649,8 @@ ,eo.STATUS,eo.ANSWER1,eo.ANSWER2,eo.ANSWER3,eo.ANSWER4,eo.CONFIRM_NAME from - BUS_HOTWORK_MEASURES_CFD f - left join BUS_HOTWORKTOMEASURES_CFD eo on eo.BUS_HOTWORK_MEASURES_ID = f.BUS_HOTWORK_MEASURES_ID where f.ISDELETE = '0'