From e8c2e655ed9866e3a6fdb3a948bb427b81d540a6 Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Fri, 7 Jun 2024 17:28:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=97=E4=BA=A4=E5=BA=95=E4=BA=BA?= =?UTF-8?q?=E5=8F=AF=E6=B7=BB=E5=8A=A0=E5=A4=9A=E4=B8=AA=EF=BC=8C=20?= =?UTF-8?q?=E5=AE=8C=E5=B7=A5=E5=AE=A1=E6=A0=B8=E6=97=B6=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=B8=89=E4=B8=AA=E5=AE=A1=E6=A0=B8=E5=AD=97=E6=AE=B5=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../highriskwork/AppHotworkCfdController.java | 37 +++++++++++-------- .../impl/HotworkCfdServiceImpl.java | 3 +- .../highriskwork/HotworkCfdMapper.xml | 3 ++ 3 files changed, 27 insertions(+), 16 deletions(-) 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 13d0c4e2..c807eace 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java @@ -721,6 +721,7 @@ public class AppHotworkCfdController extends BaseController { pd = this.getPageData(); PageData pd2 = new PageData(); pd2 = hotworkCfdService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 PageData log = new PageData(); @@ -755,6 +756,9 @@ public class AppHotworkCfdController extends BaseController { } pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); 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); log.put("ACTION", "验收通过"); @@ -1098,11 +1102,14 @@ public class AppHotworkCfdController extends BaseController { case "7"://班长 if (files != null && files.length > 0) { PageData condition = new PageData(); - condition.put("HOTWORK_ID",pd2.getString("HOTWORK_ID")); - List acceptUsers = hotworkAcceptUserCfdService.listAll(condition); - if (acceptUsers.size() <= 0){ - map.put("code","9999"); - map.put("errorMessage","接受交底人未签字"); + pd.put("HOTWORK_ID",pd2.getString("HOTWORK_ID")); +// condition.put("HOTWORK_ID",pd2.getString("HOTWORK_ID")); + hotworkCfdService.addInfo(pd); + //List acceptUsers = hotworkAcceptUserCfdService.listAll(condition); + List acceptConfessList = (List) pd.get("acceptConfessList"); + if (acceptConfessList == null || acceptConfessList.size() <= 0 || "0".equals(pd.getString("acceptConfessStatus"))) { + map.put("code", "9999"); + map.put("errorMessage", "接受交底人未签字"); return map; } MultipartFile file = files[0]; @@ -1666,16 +1673,16 @@ public class AppHotworkCfdController extends BaseController { map.put("gasList", hotworkGasCfdService.listAll(pd)); // imgList是接受交底人签字 List acceptConfessList = (List) pd.get("acceptConfessList"); -// List imgList = new ArrayList<>(); -// if (acceptConfessList != null) { -// for (PageData acceptConfess : acceptConfessList) { -// String signerPath = acceptConfess.getString("ACCEPT_CONFESS_USER_SIGNER_PATH"); -// if (signerPath != null && !signerPath.isEmpty()) { -// imgList.add(signerPath); -// } -// } -// } - map.put("imgList", acceptConfessList); + List imgList = new ArrayList<>(); + if (acceptConfessList != null) { + for (PageData acceptConfess : acceptConfessList) { + String signerPath = acceptConfess.getString("ACCEPT_CONFESS_USER_SIGNER_PATH"); + if (signerPath != null && !signerPath.isEmpty()) { + imgList.add(signerPath); + } + } + } + map.put("imgList", imgList); // map.put("imgList", hotworkAcceptUserCfdService.findByIds(pd)); // map.put("imgList1", hotworkAcceptUserCfdService.findById(pd)); condition.clear(); 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 5b1dcb4c..61db4d89 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java @@ -65,7 +65,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService { @Transactional public void saveConfess(PageData info) throws Exception{ List list = Warden.getList(info.getString("confessList")); - List listAccept = Warden.getList(info.getString("acceptconfessUserList")); + List listAccept = Warden.getList(info.getString("acceptconfessList")); String flowsId = Warden.get32UUID(); String time = DateUtil.getTime(); 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("COUNTCONFESS", "0")); sumCount += Integer.parseInt(info.getString("COUNTAUDIT", "0")); + sumCount += Integer.parseInt(info.getString("acceptConfessNum", "0")); info.put("SUMCOUNT", sumCount); // 气体分析人需处理数 diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml index d10d0b51..f106a0af 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml @@ -359,6 +359,9 @@ ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH}, ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME}, CONFIRM_OTHER_CONTENT = #{CONFIRM_OTHER_CONTENT}, + FIRE_COMPLETED = #{FIRE_COMPLETED}, + SITE_CLEANED = #{SITE_CLEANED}, + NO_REMAINING_EMBERS = #{NO_REMAINING_EMBERS}, HOTWORK_ID = HOTWORK_ID where HOTWORK_ID = #{HOTWORK_ID}