guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

动火新流程自测遇到的bug修复

liujun-2024-05-23-接口漏洞修复
liujun 2024-02-04 08:43:27 +08:00
parent eb55ddc46a
commit 20642b4022
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java
View File

@ -1408,11 +1408,16 @@ public class AppHotworkCfdController extends BaseController {
pd = hotworkCfdService.findById(pd); //根据ID读取 pd = hotworkCfdService.findById(pd); //根据ID读取
// created by liu jun 添加（交底人、项目主管部门负责人、安全措施确认人） // created by liu jun 添加（交底人、项目主管部门负责人、安全措施确认人）
hotworkCfdService.addInfo(pd); 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("gasList", hotworkGasCfdService.listAll(pd));
map.put("imgList", hotworkAcceptUserCfdService.findByIds(pd)); map.put("imgList", hotworkAcceptUserCfdService.findByIds(pd));
map.put("imgList1", hotworkAcceptUserCfdService.findById(pd)); map.put("imgList1", hotworkAcceptUserCfdService.findById(pd));
PageData condition = new PageData(); condition.clear();
condition.put("TYPE","115"); condition.put("TYPE","115");
condition.put("FOREIGN_KEY",pd.getString("HOTWORK_ID")); condition.put("FOREIGN_KEY",pd.getString("HOTWORK_ID"));
map.put("imgList2",imgFilesService.listAll(condition)); map.put("imgList2",imgFilesService.listAll(condition));
@ -1482,7 +1487,6 @@ public class AppHotworkCfdController extends BaseController {
*/ */
@RequestMapping(value="/countCheck") @RequestMapping(value="/countCheck")
@ResponseBody @ResponseBody
@LogAnno(menuType= "手机",menuServer= "动火作业",instructionsOperate = "动火作业",instructionsType = "待办作业数统计")
public Object countCheck() throws Exception{ public Object countCheck() throws Exception{
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success"; String errInfo = "success";

19
src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java
View File

@ -342,7 +342,24 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
*/ */
@Override @Override
public PageData countCheck(PageData pd) throws Exception { 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 @Override

2
src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml
View File

@ -1649,10 +1649,8 @@
,eo.STATUS,eo.ANSWER1,eo.ANSWER2,eo.ANSWER3,eo.ANSWER4,eo.CONFIRM_NAME ,eo.STATUS,eo.ANSWER1,eo.ANSWER2,eo.ANSWER3,eo.ANSWER4,eo.CONFIRM_NAME
</if> </if>
from from
<!--BUS_HOTWORK_MEASURES f-->
BUS_HOTWORK_MEASURES_CFD f BUS_HOTWORK_MEASURES_CFD f
<if test="APPLY_STATUS != '1' and APPLY_STATUS != 1"> <if test="APPLY_STATUS != '1' and APPLY_STATUS != 1">
<!--left join BUS_HOTWORKTOMEASURES eo on eo.BUS_HOTWORK_MEASURES_ID = f.BUS_HOTWORK_MEASURES_ID-->
left join BUS_HOTWORKTOMEASURES_CFD eo on eo.BUS_HOTWORK_MEASURES_ID = f.BUS_HOTWORK_MEASURES_ID left join BUS_HOTWORKTOMEASURES_CFD eo on eo.BUS_HOTWORK_MEASURES_ID = f.BUS_HOTWORK_MEASURES_ID
</if> </if>
where f.ISDELETE = '0' where f.ISDELETE = '0'