From 44d1708a7982e885d5df40c36b2e15366395009e Mon Sep 17 00:00:00 2001 From: chenxinying <1039655633@qq.com> Date: Wed, 24 Jan 2024 14:00:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E9=AA=8C=E6=94=B6=EF=BC=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6=EF=BC=8C=E6=98=BE=E7=A4=BA=E7=AD=BE?= =?UTF-8?q?=E5=AD=97=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eightwork/AppHotworkController.java | 13 ----------- .../service/eightwork/HotworkService.java | 2 -- .../eightwork/impl/HotworkServiceImpl.java | 22 ++++++------------- .../datasource/eightwork/HotWorkMapper.xml | 10 +++++++++ 4 files changed, 17 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java b/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java index ad59de1..78fdeb0 100644 --- a/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java +++ b/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java @@ -157,19 +157,6 @@ public class AppHotworkController extends BaseController { return map; } - @RequestMapping("/accept") - @ResponseBody - @LogAnno(menuType= "手机",menuServer= "动火作业",instructionsOperate = "动火作业",instructionsType = "验收归档") - public Object accept() throws Exception { - Map map = new HashMap<>(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - hotworkService.accept(pd); - map.put("result",errInfo); - return map; - } - @RequestMapping("/checkWorkCount") @ResponseBody public Object checkWorkCount() throws Exception{ diff --git a/src/main/java/com/zcloud/service/eightwork/HotworkService.java b/src/main/java/com/zcloud/service/eightwork/HotworkService.java index e0e6cd7..9e7e4cf 100644 --- a/src/main/java/com/zcloud/service/eightwork/HotworkService.java +++ b/src/main/java/com/zcloud/service/eightwork/HotworkService.java @@ -22,8 +22,6 @@ public interface HotworkService { void nextStep(PageData pd, MultipartFile[] files) throws Exception; - void accept(PageData pd)throws Exception; - void cancel(PageData pd) throws Exception; PageData findById(PageData pd) throws Exception; diff --git a/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java index 15c2cb9..cb6ba59 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java @@ -136,29 +136,21 @@ public class HotworkServiceImpl implements HotworkService { List unsignedList = hotworkSignMapper.checkUnsigned(sign);//当前步骤未签名人列表 if(unsignedList == null || unsignedList.size() == 0){//如果没有未签人 则跳转下一步 hotworkMapper.editStep(work); - PageData currentflow = getStep(work.get("TASK_ID"), work.get("STEP_ID")); - if (work.get("PREPARERS") != null && !work.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤 - savePreparers(work,currentflow); - } //保存日志 saveLog(work,work.getString(flow.get("ACTOR_FIELD")),"1"); - + PageData currentflow = getStep(work.get("TASK_ID"), work.get("STEP_ID")); + if("99".equals(currentflow.getString("NEXT_STEP_ID"))){ + return; + } + if (work.get("PREPARERS") != null && !work.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤 + savePreparers(work,currentflow); + } saveNextSigner(work,currentflow); } } - /** - * 验收归档 - */ - @Override - public void accept(PageData pd)throws Exception{ - PageData flow = getStep(pd.get("TASK_ID"), 99); - hotworkMapper.edit(pd); - saveLog(pd,pd.getString(flow.get("ACTOR_FIELD")),"1"); - } - /** * 取消 */ diff --git a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml index 140b602..0d706a2 100644 --- a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml @@ -301,6 +301,13 @@ monitor.SIGN_TIME as MONITOR_USER_SIGNER_TIME, monitor.SIGN_PATH as MONITOR_USER_SIGNER_PATH, IFNULL(monitor.DESCR,'无') as MONITOR_CONTENT, + start.SIGN_TIME as WORK_START_USER_SIGNER_TIME, + start.SIGN_PATH as WORK_START_USER_SIGNER_PATH, + end.SIGN_TIME as WORK_END_USER_SIGNER_TIME, + end.SIGN_PATH as WORK_END_USER_SIGNER_PATH, + accept.SIGN_TIME as ACCEPT_USER_SIGNER_TIME, + accept.SIGN_PATH as ACCEPT_USER_SIGNER_PATH, + IFNULL(accept.DESCR,'无') as ACCEPT_CONTENT, f.ANALYZE_TIME FROM bus_hotwork AS f @@ -348,6 +355,9 @@ left join bus_hotwork_sign audit on audit.HOTWORK_ID = f.HOTWORK_ID and audit.STEP_ID = '10' left join bus_hotwork_sign approve on approve.HOTWORK_ID = f.HOTWORK_ID and approve.STEP_ID = '11' left join bus_hotwork_sign monitor on monitor.HOTWORK_ID = f.HOTWORK_ID and monitor.STEP_ID = '12' + left join bus_hotwork_sign start on start.HOTWORK_ID = f.HOTWORK_ID and start.STEP_ID = '13' + left join bus_hotwork_sign end on end.HOTWORK_ID = f.HOTWORK_ID and end.STEP_ID = '14' + left join bus_hotwork_sign accept on accept.HOTWORK_ID = f.HOTWORK_ID and accept.STEP_ID = '15' WHERE f.HOTWORK_ID = #{HOTWORK_ID}