From 5b9d19939d248a97a09836f587facf2a9a174817 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 11 Apr 2022 15:19:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20bug=20#52429=20=E5=8F=8A=20?= =?UTF-8?q?=E6=94=BF=E7=AD=96=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=20?= =?UTF-8?q?=E5=A1=AB=E5=86=99=E9=A9=B3=E5=9B=9E=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../policyCommentProcess/DirectorAfter.java | 43 +++++++---- .../DistributionAfter.java | 4 +- .../DockerReviewAfter.java | 74 +++++++++--------- .../EngineerReviewAfter.java | 75 +++++++++---------- .../EngineerRevisionAfter.java | 4 +- .../FillCommentAfter.java | 10 +-- .../policyCommentProcess/LaunchAfter.java | 2 +- .../MinisterReviewAfter.java | 72 ++++++++---------- .../ViceDirectorAfter.java | 72 ++++++++---------- 9 files changed, 176 insertions(+), 180 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorAfter.java index b86028c4..ba602b0b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorAfter.java @@ -8,7 +8,9 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; @@ -57,27 +59,38 @@ public class DirectorAfter implements TaskListener { if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("1"); -// one1.setPrcName(prcName); + one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.save(busProcessNew); - if (object.getString("lawsProveChiefVerify")=="0"){ - func2(delegateTask, busBean, object, "0", busProcessNameService); - } + if(StringUtils.isNotBlank(object.getString("actionFlag"))){ + String lawsProveEngineerId2 = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId"); + if ("0".equalsIgnoreCase(object.getString("actionFlag"))) { + BussUtils.endFunAll(delegateTask, prcName,busBean, object, "0", busProcessNameService,"laws2"); + delegateTask.setVariable("lawsProveChiefVerify",0); + + } else { + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busProcessNew.setUserId(lawsProveEngineerId2); + busProcessNew.setPrcName(prcName); + busBean.save(busProcessNew); + + BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1"); + delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineerId2); + delegateTask.setVariable("lawsProveChiefVerify", 1); + } + }else { + throw new ActivitiException("1#2 提交OR驳回参数不存在"); + } } private String verifyObj(String str){ diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java index df2efd86..182d670c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java @@ -66,14 +66,14 @@ public class DistributionAfter implements TaskListener { String username = object.getString("prcCreateUserName"); // object.getString("standName") String standName = ""; - String prcName = "政策征求意见流程-工程师填写意见"; + String prcName = "政策征求意见流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setOverTime(OVERTIME); one1.setPrcType("laws2"); -// one1.setPrcName(prcName); + one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewAfter.java index 97cac22c..2e79982e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewAfter.java @@ -8,7 +8,9 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; @@ -36,18 +38,17 @@ public class DockerReviewAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - if("0".equals(object.getString("actionFlag"))){ - String lawsProveEngineer = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId"); - if(StringUtils.isNotBlank(lawsProveEngineer)){ - delegateTask.setVariable("lawsProveEngineerId",lawsProveEngineer); - delegateTask.setVariable("responseDockerVerify",0); - - nextUserList= Arrays.asList(lawsProveEngineer.split(",")); - delegateTask.addCandidateUsers(nextUserList); - } - }else { - delegateTask.setVariable("responseDockerVerify",1); - } +// if("0".equals(object.getString("actionFlag"))){ +// String lawsProveEngineer = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId"); +// if(StringUtils.isNotBlank(lawsProveEngineer)){ +// delegateTask.setVariable("lawsProveEngineerId",lawsProveEngineer); +// delegateTask.setVariable("responseDockerVerify",0); +// +// nextUserList.add(object.getString("lawsProveEngineerId")); +// } +// }else { +// delegateTask.setVariable("responseDockerVerify",1); +// } //截止时间 流程描述 创建人 @@ -63,37 +64,40 @@ public class DockerReviewAfter implements TaskListener { if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("laws2"); -// one1.setPrcName(prcName); + one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.save(busProcessNew); + if(StringUtils.isNotBlank(object.getString("actionFlag"))){ + String lawsProveEngineer = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId"); + String commentUser = JSONObject.parseObject(object.getString("form")).getString("commentUser"); + if ("0".equalsIgnoreCase(object.getString("actionFlag"))) { - if(nextUserList != null && !nextUserList.isEmpty()){ - for(String nextUser : nextUserList){ + delegateTask.setVariable("lawsProveEngineerId",lawsProveEngineer); + nextUserList.add(lawsProveEngineer); - BusProcessNew busProcessNewNext = new BusProcessNew(); - busProcessNewNext.setMsgType("clause"); - busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo("法规工程师修订征求意见"); - busProcessNewNext.setUserId(nextUser); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); + BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList); + delegateTask.setVariable("responseDockerVerify", 0); + } else { + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busProcessNew.setUserId(commentUser); + busProcessNew.setPrcName(prcName); + busBean.save(busProcessNew); + + BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1"); + delegateTask.setVariable("commentUser",commentUser); + delegateTask.setVariable("responseDockerVerify", 1); } + }else { + throw new ActivitiException("1#2 提交OR驳回参数不存在"); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewAfter.java index 188274fc..67760ca2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewAfter.java @@ -9,7 +9,9 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; @@ -36,44 +38,20 @@ public class EngineerReviewAfter implements TaskListener { List nextUserList = new ArrayList(); - if ("0".equals( object.getString("actionFlag"))){ - JSONObject form = JSONObject.parseObject(object.getString("form")); - String lawsProveEngineer = JSONObject.parseObject(form.getString("form")).getString("lawsProveEngineerId"); - if(StringUtils.isNotBlank(lawsProveEngineer)){ - - JSONArray commentCollectionList =delegateTask.getVariable("commentCollectionList", JSONArray.class); - if (commentCollectionList==null) { - commentCollectionList=new JSONArray(); - } - commentCollectionList.addAll(object.getJSONArray("info")); - delegateTask.setVariable("commentCollectionList",commentCollectionList); - - - delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineer); - delegateTask.setVariable("lawsProveEngineerVerify",0); - - - nextUserList= Arrays.asList(lawsProveEngineer.split(",")); - delegateTask.addCandidateUsers(nextUserList); - } - } - - - //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); // object.getString("standName") String standName = ""; - String prcName = "政策征求意见流程-法规工程师汇总修订"; + String prcName = "政策征求意见流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("laws2"); -// one1.setPrcName(prcName); + one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); @@ -103,20 +81,41 @@ public class EngineerReviewAfter implements TaskListener { busBean.save(busProcessNew); } + if(StringUtils.isNotBlank(object.getString("actionFlag"))){ + String lawsProveEngineer = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId"); + String commentUser = JSONObject.parseObject(object.getString("form")).getString("commentUser"); + if ("0".equalsIgnoreCase(object.getString("actionFlag"))) { - if(nextUserList != null && !nextUserList.isEmpty()){ - for(String nextUser : nextUserList){ - BusProcessNew busProcessNewNext = new BusProcessNew(); - busProcessNewNext.setMsgType("clause"); - busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(nextUser); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); + JSONArray commentCollectionList =delegateTask.getVariable("commentCollectionList", JSONArray.class); + if (commentCollectionList==null) { + commentCollectionList=new JSONArray(); + } + commentCollectionList.addAll(object.getJSONArray("info")); + delegateTask.setVariable("commentCollectionList",commentCollectionList); + + delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineer); + nextUserList.add(lawsProveEngineer); + + BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList); + delegateTask.setVariable("lawsProveEngineerVerify", 0); + } else { + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busProcessNew.setUserId(commentUser); + busProcessNew.setPrcName(prcName); + busBean.save(busProcessNew); + + BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1"); + delegateTask.setVariable("commentUser",commentUser); + delegateTask.setVariable("lawsProveEngineerVerify", 1); } + }else { + throw new ActivitiException("1#2 提交OR驳回参数不存在"); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java index d7b97d53..7230b8c8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java @@ -54,14 +54,14 @@ public class EngineerRevisionAfter implements TaskListener { String username = object.getString("prcCreateUserName"); // object.getString("standName") String standName = ""; - String prcName = "政策征求意见流程-法规认证部长审核"; + String prcName = "政策征求意见流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("laws2"); -// one1.setPrcName(prcName); + one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java index 4b41a489..d4d1d07b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java @@ -40,12 +40,8 @@ public class FillCommentAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); if(StringUtils.isNotBlank(responseDocker)){ - - - delegateTask.setVariable("responseDockerId",responseDocker); - nextUserList= Arrays.asList(responseDocker.split(",")); - delegateTask.addCandidateUsers(nextUserList); + nextUserList.add(object.getString("responseDockerId")); } @@ -55,14 +51,14 @@ public class FillCommentAfter implements TaskListener { String username = object.getString("prcCreateUserName"); // object.getString("standName") String standName = ""; - String prcName = "政策征求意见流程-责任对接人审核"; + String prcName = "政策征求意见流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("laws2"); -// one1.setPrcName(prcName); + one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchAfter.java index b7eedeca..b2d59dcc 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchAfter.java @@ -49,7 +49,7 @@ public class LaunchAfter implements TaskListener { String username = object.getString("prcCreateUserName"); // object.getString("standName") String standName = ""; - String prcName = "政策征求意见流程-任务分发"; + String prcName = "政策征求意见流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewAfter.java index 7a20e24f..140c77d7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewAfter.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.policyCommentProcess; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; @@ -8,7 +9,9 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; @@ -37,65 +40,54 @@ public class MinisterReviewAfter implements TaskListener { List nextUserList = new ArrayList(); - if ("0".equals(object.getString("actionFlag"))){ - - JSONObject form = JSONObject.parseObject(object.getString("form")); - String lawsProveViceChief = JSONObject.parseObject(form.getString("form")).getString("lawsProveViceChiefId"); - if(StringUtils.isNotBlank(lawsProveViceChief)){ - - delegateTask.setVariable("lawsProveMinisterVerify",0); - delegateTask.setVariable("lawsProveViceChiefId",lawsProveViceChief); - nextUserList= Arrays.asList(lawsProveViceChief.split(",")); - delegateTask.addCandidateUsers(nextUserList); - } - } - - - //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); // object.getString("standName") String standName = ""; - String prcName = "政策征求意见流程-法规认证副总监审核"; + String prcName = "政策征求意见流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("laws2"); -// one1.setPrcName(prcName); + one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.save(busProcessNew); + if(StringUtils.isNotBlank(object.getString("actionFlag"))){ + String lawsProveViceChief = JSONObject.parseObject(object.getString("form")).getString("lawsProveViceChiefId"); + String lawsProveEngineerId2 = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId"); - if(nextUserList != null && !nextUserList.isEmpty()){ - for(String nextUser : nextUserList){ - BusProcessNew busProcessNewNext = new BusProcessNew(); - busProcessNewNext.setMsgType("clause"); - busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(nextUser); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); + if ("0".equalsIgnoreCase(object.getString("actionFlag"))) { + + delegateTask.setVariable("lawsProveViceChiefId",lawsProveViceChief); + nextUserList.add(lawsProveViceChief); + + BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList); + delegateTask.setVariable("lawsProveMinisterVerify", 0); + } else { + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busProcessNew.setUserId(lawsProveEngineerId2); + busProcessNew.setPrcName(prcName); + busBean.save(busProcessNew); + + BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1"); + delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineerId2); + delegateTask.setVariable("lawsProveMinisterVerify", 1); } + }else { + throw new ActivitiException("1#2 提交OR驳回参数不存在"); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorAfter.java index 1ef736a7..cfe241af 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorAfter.java @@ -8,7 +8,9 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; @@ -37,65 +39,55 @@ public class ViceDirectorAfter implements TaskListener { List nextUserList = new ArrayList(); - if ("0".equals(object.getString("actionFlag"))){ - - - JSONObject form = JSONObject.parseObject(object.getString("form")); - String lawsProveChief = JSONObject.parseObject(form.getString("form")).getString("lawsProveChiefId"); - if(StringUtils.isNotBlank(lawsProveChief)){ - - delegateTask.setVariable("lawsProveViceChiefVerify",0); - delegateTask.setVariable("lawsProveChiefId",lawsProveChief); - nextUserList= Arrays.asList(lawsProveChief.split(",")); - delegateTask.addCandidateUsers(nextUserList); - } - } - - //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); // object.getString("standName") String standName = ""; - String prcName = "政策征求意见流程-法规认证总监审核"; + String prcName = "政策征求意见流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ // one1.setOverTime(OVERTIME); one1.setPrcType("laws2"); -// one1.setPrcName(prcName); + one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.save(busProcessNew); + if(StringUtils.isNotBlank(object.getString("actionFlag"))){ + String lawsProveChief = JSONObject.parseObject(object.getString("form")).getString("lawsProveChiefId"); + String lawsProveEngineerId2 = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId"); - if(nextUserList != null && !nextUserList.isEmpty()){ - for(String nextUser : nextUserList){ - BusProcessNew busProcessNewNext = new BusProcessNew(); - busProcessNewNext.setMsgType("clause"); - busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(nextUser); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); + if ("0".equalsIgnoreCase(object.getString("actionFlag"))) { + + nextUserList.add(lawsProveChief); + + delegateTask.setVariable("lawsProveChiefId",lawsProveChief); + + BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList); + delegateTask.setVariable("lawsProveViceChiefVerify", 0); + } else { + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busProcessNew.setUserId(lawsProveEngineerId2); + busProcessNew.setPrcName(prcName); + busBean.save(busProcessNew); + + BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1"); + delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineerId2); + delegateTask.setVariable("lawsProveViceChiefVerify", 1); } + }else { + throw new ActivitiException("1#2 提交OR驳回参数不存在"); } } From 554bd18946470009c40218a5540e32f495d07fa4 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 11 Apr 2022 16:09:40 +0800 Subject: [PATCH 2/2] feat: bug #52378 --- .../wkflow/listener/policyCommentProcess/DistributionAfter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java index 182d670c..b6aa7adb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java @@ -71,7 +71,7 @@ public class DistributionAfter implements TaskListener { queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ - one1.setOverTime(OVERTIME); +// one1.setOverTime(OVERTIME); one1.setPrcType("laws2"); one1.setPrcName(prcName); one1.setCreatUser(user);