From c2a4f2a47520aaa1e34cbc97d216d46d87e70f3b Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 10 Apr 2024 11:19:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8app=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/highriskwork/AppHotworkCfdController.java | 3 ++- .../datasource/highriskwork/HotworkCfdMapper.xml | 11 ++++++++--- 2 files changed, 10 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 dc795311..5fd4678a 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java @@ -895,7 +895,8 @@ public class AppHotworkCfdController extends BaseController { pd2.put("CONFIRM_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONFIRM_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - pd2.put("CONFIRM_CONTENT", pd.get("APPROVAL_CONTENT")); + pd2.put("CONFIRM_CONTENT", pd.get("CONTENT")); + pd2.put("CONFIRM_OTHER_CONTENT", pd.get("APPROVAL_CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); hotworkCfdService.edit(pd2); log.put("ACTION", "作业单位通过"); diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml index 34b7d9de..a4f28db3 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml @@ -88,7 +88,8 @@ f.ACCEPT_CONFESS_USER_ID, f.ACCEPT_CONFESS_USER_SIGNER_PATH, f.ACCEPT_CONFESS_USER_SIGNER_TIME, - f.ANALYZE_TIME + f.ANALYZE_TIME, + f.CONFIRM_OTHER_CONTENT @@ -167,7 +168,8 @@ ACCEPT_CONFESS_USER_ID, ACCEPT_CONFESS_USER_SIGNER_PATH, ACCEPT_CONFESS_USER_SIGNER_TIME, - ANALYZE_TIME + ANALYZE_TIME, + CONFIRM_OTHER_CONTENT @@ -246,7 +248,8 @@ #{ACCEPT_CONFESS_USER_ID}, #{ACCEPT_CONFESS_USER_SIGNER_PATH}, #{ACCEPT_CONFESS_USER_SIGNER_TIME}, - #{ANALYZE_TIME} + #{ANALYZE_TIME}, + #{CONFIRM_OTHER_CONTENT} @@ -355,6 +358,7 @@ ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}, 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}, HOTWORK_ID = HOTWORK_ID where HOTWORK_ID = #{HOTWORK_ID} @@ -542,6 +546,7 @@ f.ACCEPT_CONFESS_USER_SIGNER_PATH, f.ACCEPT_CONFESS_USER_SIGNER_TIME, f.HOTWORK_ID, + f.CONFIRM_OTHER_CONTENT, ad.NAME as APPLY_DEPARTMENT_NAME, au.NAME as APPLY_USER_NAME, From fb98f35b2421e726d11feead0f86342200ba307c Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 10 Apr 2024 13:10:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?15061=20=E5=8A=A8=E7=81=AB=E5=89=8D?= =?UTF-8?q?=E9=AA=8C=E7=A5=A8=E7=A1=AE=E8=AE=A4=E5=89=8D=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=97=E4=BA=A4=E5=BA=95=E4=BA=BA=E5=BF=85=E9=A1=BB=E7=AD=BE?= =?UTF-8?q?=E5=AD=97=20=E7=8E=B0=E5=9C=A8=E6=B2=A1=E6=9C=89=E9=99=90?= =?UTF-8?q?=E5=88=B6=20=E6=8E=A5=E5=8F=97=E4=BA=A4=E5=BA=95=E4=BA=BA?= =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E4=B8=8D=E7=AD=BE=E5=AD=97=E4=B9=9F=E8=83=BD?= =?UTF-8?q?=E8=B5=B0=E5=AE=8C=E6=B5=81=E7=A8=8B=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/highriskwork/AppHotworkCfdController.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 5fd4678a..5bb9fc6a 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java @@ -1097,6 +1097,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","接受交底人未签字"); + return map; + } MultipartFile file = files[0]; String ffile = DateUtil.getDays(); From 60bfb26030d0672a50a92777e67c883633afdd8b Mon Sep 17 00:00:00 2001 From: limingyu Date: Wed, 10 Apr 2024 15:21:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?15066=E5=87=BA=E7=8E=B0=E4=BA=86=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E6=8E=AA=E6=96=BD=E7=A1=AE=E8=AE=A4=E4=BA=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=A2=E5=A4=B1=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/highriskwork/BusHotworkCfdExamineMapper.java | 2 ++ .../service/highriskwork/impl/HotworkCfdServiceImpl.java | 3 ++- .../datasource/highriskwork/BusHotworkCfdExamineMapper.xml | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/mapper/datasource/highriskwork/BusHotworkCfdExamineMapper.java b/src/main/java/com/zcloud/mapper/datasource/highriskwork/BusHotworkCfdExamineMapper.java index 523de699..b1c821aa 100644 --- a/src/main/java/com/zcloud/mapper/datasource/highriskwork/BusHotworkCfdExamineMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/highriskwork/BusHotworkCfdExamineMapper.java @@ -26,5 +26,7 @@ public interface BusHotworkCfdExamineMapper { List findByCondition(PageData condition); List safetylistPage(Page page); + + List listAllByHotWorkId(PageData condition); } 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 2916c7c2..3d6e88f4 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java @@ -284,7 +284,8 @@ public class HotworkCfdServiceImpl implements HotworkCfdService { hotworkCfdMapper.delete(pd); PageData condition = new PageData(); condition.put("HOTWORK_ID", pd.getString("HOTWORK_ID")); - List oldEntity = busHotworkCfdExamineMapper.listAll(condition); +// List oldEntity = busHotworkCfdExamineMapper.listAll(condition); + List oldEntity = busHotworkCfdExamineMapper.listAllByHotWorkId(condition); for (PageData entity : oldEntity) { entity.put("IS_DELETE", "1"); busHotworkCfdExamineMapper.edit(entity); diff --git a/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml index 7df5eee7..820319df 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml @@ -308,5 +308,9 @@ ORDER BY f.APPLY_STATUS,f.CREATTIME DESC + + From 03ebdabc6d34397ce4af9451a1e97196f5172315 Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 10 Apr 2024 16:43:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?15050=20=E7=9B=91=E6=8A=A4=E4=BA=BA?= =?UTF-8?q?=E7=AD=BE=E5=AD=97=E5=88=97=E8=A1=A8=20=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=BC=BA=E5=B0=91=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/highriskwork/AppHotworkCfdController.java | 10 ++++++++++ .../highriskwork/impl/HotworkCfdServiceImpl.java | 1 + 2 files changed, 11 insertions(+) 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 5bb9fc6a..e7250d05 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java @@ -1207,6 +1207,13 @@ public class AppHotworkCfdController extends BaseController { //sendMessageUtil.sendMessages(mes, paramsList); } break; + case "-1.5": {//确认 + log.put("ACTION", "作业负责人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("AUDIT_CONTENT", pd.get("CONTENT")); + hotworkCfdService.edit(pd2); + break; + } case "-2": {//确认打回 log.put("ACTION", "作业单位打回"); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); @@ -1856,6 +1863,7 @@ public class AppHotworkCfdController extends BaseController { condition.put("CORPINFO_ID",request.get("CORPINFO_ID")); condition.put("TYPE","2"); condition.put("APPROVAL_STATUS","1"); + condition.put("APPROVAL_CONTENT", request.getString("APPROVAL_CONTENT")); hotworkCfdService.confessApproval(condition, files); // 保存安全项信息 @@ -1877,6 +1885,8 @@ public class AppHotworkCfdController extends BaseController { measures.put("CONFIRM_NAME", request.get("ACTION_USER")); hotworkToMeasuresCfdService.save(measures); } + + // 保存其他审批意见 response.put("result", "success"); return response; } catch (Exception e) { 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 3d6e88f4..96918bc1 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java @@ -232,6 +232,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService { entity.put("APPROVAL_STATUS", request.getString("APPROVAL_STATUS")); entity.put("APPROVAL_SIGNATURE", Warden.saveFile(files,request.getString("CORPINFO_ID"))); entity.put("APPROVAL_SIGNATURE_TIME", DateUtil.getTime()); + entity.put("APPROVAL_CONTENT",request.getString("APPROVAL_CONTENT")); busHotworkCfdExamineMapper.edit(entity); }