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

接受交底人可添加多个， 

完工审核时新增三个审核字段入库保存
liujun0703-新项目开发^2^2
WenShiJun 2024-06-07 17:28:02 +08:00
parent 87178f4289
commit e8c2e655ed
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -721,6 +721,7 @@ public class AppHotworkCfdController extends BaseController {
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())); //修改时间
PageData log = new PageData(); PageData log = new PageData();
@ -755,6 +756,9 @@ public class AppHotworkCfdController extends BaseController {
} }
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); 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); hotworkCfdService.edit(pd2);
log.put("ACTION", "验收通过"); log.put("ACTION", "验收通过");
@ -1098,11 +1102,14 @@ public class AppHotworkCfdController extends BaseController {
case "7"://班长 case "7"://班长
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
PageData condition = new PageData(); 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; return map;
} }
MultipartFile file = files[0]; MultipartFile file = files[0];
@ -1666,16 +1673,16 @@ public class AppHotworkCfdController extends BaseController {
map.put("gasList", hotworkGasCfdService.listAll(pd)); map.put("gasList", hotworkGasCfdService.listAll(pd));
// imgList是接受交底人签字 // imgList是接受交底人签字
List<PageData> acceptConfessList = (List<PageData>) pd.get("acceptConfessList"); List<PageData> acceptConfessList = (List<PageData>) pd.get("acceptConfessList");
// List<String> imgList = new ArrayList<>(); List<String> imgList = new ArrayList<>();
// if (acceptConfessList != null) { if (acceptConfessList != null) {
// for (PageData acceptConfess : acceptConfessList) { for (PageData acceptConfess : acceptConfessList) {
// String signerPath = acceptConfess.getString("ACCEPT_CONFESS_USER_SIGNER_PATH"); String signerPath = acceptConfess.getString("ACCEPT_CONFESS_USER_SIGNER_PATH");
// if (signerPath != null && !signerPath.isEmpty()) { if (signerPath != null && !signerPath.isEmpty()) {
// imgList.add(signerPath); imgList.add(signerPath);
// } }
// } }
// } }
map.put("imgList", acceptConfessList); map.put("imgList", 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();

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

@ -65,7 +65,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
@Transactional @Transactional
public void saveConfess(PageData info) throws Exception{ public void saveConfess(PageData info) throws Exception{
List<PageData> list = Warden.getList(info.getString("confessList")); List<PageData> list = Warden.getList(info.getString("confessList"));
List<PageData> listAccept = Warden.getList(info.getString("acceptconfessUserList")); List<PageData> listAccept = Warden.getList(info.getString("acceptconfessList"));
String flowsId = Warden.get32UUID(); String flowsId = Warden.get32UUID();
String time = DateUtil.getTime(); String time = DateUtil.getTime();
PageData condition = new PageData(); PageData condition = new PageData();
@ -489,6 +489,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
sumCount += Integer.parseInt(info.getString("COUNTCONFIRM", "0")); sumCount += Integer.parseInt(info.getString("COUNTCONFIRM", "0"));
sumCount += Integer.parseInt(info.getString("COUNTCONFESS", "0")); sumCount += Integer.parseInt(info.getString("COUNTCONFESS", "0"));
sumCount += Integer.parseInt(info.getString("COUNTAUDIT", "0")); sumCount += Integer.parseInt(info.getString("COUNTAUDIT", "0"));
sumCount += Integer.parseInt(info.getString("acceptConfessNum", "0"));
info.put("SUMCOUNT", sumCount); info.put("SUMCOUNT", sumCount);
// 气体分析人需处理数 // 气体分析人需处理数

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

@ -359,6 +359,9 @@
ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH}, ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH},
ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME}, ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME},
CONFIRM_OTHER_CONTENT = #{CONFIRM_OTHER_CONTENT}, CONFIRM_OTHER_CONTENT = #{CONFIRM_OTHER_CONTENT},
FIRE_COMPLETED = #{FIRE_COMPLETED},
SITE_CLEANED = #{SITE_CLEANED},
NO_REMAINING_EMBERS = #{NO_REMAINING_EMBERS},
HOTWORK_ID = HOTWORK_ID HOTWORK_ID = HOTWORK_ID
where where
HOTWORK_ID = #{HOTWORK_ID} HOTWORK_ID = #{HOTWORK_ID}