From 439dc49719245ebed2807354cf66ca065e7a18af Mon Sep 17 00:00:00 2001 From: liujun Date: Sun, 4 Feb 2024 17:27:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=A1=E9=AA=8C=E7=9B=91?= =?UTF-8?q?=E7=AE=A1=E4=BA=BA=E3=80=81=E4=BA=A4=E5=BA=95=E4=BA=BA=E3=80=81?= =?UTF-8?q?=E4=BA=A4=E5=BA=95=E4=BA=BA=E3=80=81=E5=AE=89=E5=85=A8=E9=A1=B9?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../highriskwork/AppHotworkCfdController.java | 1 + .../impl/HotworkCfdServiceImpl.java | 21 +++++++++++++++---- 2 files changed, 18 insertions(+), 4 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 5e4741de..7db43429 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java @@ -1414,6 +1414,7 @@ public class AppHotworkCfdController extends BaseController { hotworkCfdService.addInfo(pd); map.put("gasList", hotworkGasCfdService.listAll(pd)); + // 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 eee5acc9..77e53fdc 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java @@ -3,6 +3,7 @@ package com.zcloud.service.highriskwork.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; 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.system.DepartmentMapper; import com.zcloud.service.bus.CorpInfoService; @@ -41,6 +42,9 @@ public class HotworkCfdServiceImpl implements HotworkCfdService { @Resource private DepartmentMapper departmentMapper; + @Resource + private HotworkAcceptUserCfdMapper hotworkAcceptUserCfdMapper; + /**新增 * @param pd * @throws Exception @@ -156,11 +160,20 @@ public class HotworkCfdServiceImpl implements HotworkCfdService { } String passFlag = "1"; String message = ""; - if (entity.get("ACCEPT_CONFESS_USER_SIGNER_PATH") == null || StringUtils.isEmpty(entity.getString("ACCEPT_CONFESS_USER_SIGNER_PATH"))) { - message = "交底人未签字，"; - passFlag = "0"; + + condition.clear(); + 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 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 + "监护人未签字，"; passFlag = "0"; }