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

新增校验监管人、交底人、交底人、安全项检查人

liujun-2024-05-23-接口漏洞修复
liujun 2024-02-04 17:27:29 +08:00
parent c11f5a4182
commit 439dc49719
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1414,6 +1414,7 @@ public class AppHotworkCfdController extends BaseController {
hotworkCfdService.addInfo(pd); hotworkCfdService.addInfo(pd);
map.put("gasList", hotworkGasCfdService.listAll(pd)); map.put("gasList", hotworkGasCfdService.listAll(pd));
// imgList是接受交底人签字
map.put("imgList", hotworkAcceptUserCfdService.findByIds(pd)); map.put("imgList", hotworkAcceptUserCfdService.findByIds(pd));
map.put("imgList1", hotworkAcceptUserCfdService.findById(pd)); map.put("imgList1", hotworkAcceptUserCfdService.findById(pd));
condition.clear(); condition.clear();

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

@ -3,6 +3,7 @@ package com.zcloud.service.highriskwork.impl;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.highriskwork.BusHotworkCfdExamineMapper; import com.zcloud.mapper.datasource.highriskwork.BusHotworkCfdExamineMapper;
import com.zcloud.mapper.datasource.highriskwork.HotworkAcceptUserCfdMapper;
import com.zcloud.mapper.datasource.highriskwork.HotworkCfdMapper; import com.zcloud.mapper.datasource.highriskwork.HotworkCfdMapper;
import com.zcloud.mapper.datasource.system.DepartmentMapper; import com.zcloud.mapper.datasource.system.DepartmentMapper;
import com.zcloud.service.bus.CorpInfoService; import com.zcloud.service.bus.CorpInfoService;
@ -41,6 +42,9 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
@Resource @Resource
private DepartmentMapper departmentMapper; private DepartmentMapper departmentMapper;
@Resource
private HotworkAcceptUserCfdMapper hotworkAcceptUserCfdMapper;
/**新增 /**新增
* @param pd * @param pd
* @throws Exception * @throws Exception
@ -156,11 +160,20 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
} }
String passFlag = "1"; String passFlag = "1";
String message = ""; String message = "";
if (entity.get("ACCEPT_CONFESS_USER_SIGNER_PATH") == null || StringUtils.isEmpty(entity.getString("ACCEPT_CONFESS_USER_SIGNER_PATH"))) {
message = "交底人未签字，"; condition.clear();
passFlag = "0"; condition.put("HOTWORK_ID", entity.get("HOTWORK_ID"));
condition.put("CORPINFO_ID", entity.getString("CORPINFO_ID"));
condition.put("ACCEPT_CONFESS_USER_ID", entity.get("ACCEPT_CONFESS_USER_ID"));
List<PageData> acceptUsers = hotworkAcceptUserCfdMapper.findByIds(condition);
for(PageData acceptUser:acceptUsers){
if (acceptUser.get("ACCEPT_CONFESS_USER_SIGNER_PATH") == null || StringUtils.isEmpty(acceptUser.getString("ACCEPT_CONFESS_USER_SIGNER_PATH"))) {
message = "接受交底人未签字，";
passFlag = "0";
break;
}
} }
if (entity.get("GUARDIAN_USER_SIGNER_PATH") == null || StringUtils.isEmpty(entity.getString(entity.get("GUARDIAN_USER_SIGNER_PATH")))) { if (entity.get("GUARDIAN_USER_SIGNER_PATH") == null || StringUtils.isEmpty(entity.getString("GUARDIAN_USER_SIGNER_PATH"))) {
message = message + "监护人未签字，"; message = message + "监护人未签字，";
passFlag = "0"; passFlag = "0";
} }