From 0e2ace7b7c654cae280cbdb2970a46c045d5c69e Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 12 Apr 2022 16:16:01 +0800 Subject: [PATCH] feat: There is no way the, bug #52552 #52542 --- .../policyCommentProcess/DirectorAfter.java | 4 +- .../DockerReviewAfter.java | 6 +- .../EngineerReviewAfter.java | 73 ++++++++++++++----- .../EngineerRevisionAfter.java | 6 +- .../FillCommentAfter.java | 2 +- .../MinisterReviewAfter.java | 4 +- .../ViceDirectorAfter.java | 4 +- 7 files changed, 67 insertions(+), 32 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 ba602b0b..2d1c59f6 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 @@ -58,7 +58,7 @@ public class DirectorAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ // one1.setOverTime(OVERTIME); - one1.setPrcType("1"); + one1.setPrcType("laws2"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); @@ -66,7 +66,7 @@ public class DirectorAfter implements TaskListener { } if(StringUtils.isNotBlank(object.getString("actionFlag"))){ - String lawsProveEngineerId2 = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId"); + String lawsProveEngineerId2 = object.getString("lawsProveEngineerId"); if ("0".equalsIgnoreCase(object.getString("actionFlag"))) { BussUtils.endFunAll(delegateTask, prcName,busBean, object, "0", busProcessNameService,"laws2"); 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 2e79982e..ce300c29 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 @@ -57,7 +57,7 @@ public class DockerReviewAfter 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); @@ -71,8 +71,8 @@ public class DockerReviewAfter implements TaskListener { } if(StringUtils.isNotBlank(object.getString("actionFlag"))){ - String lawsProveEngineer = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId"); - String commentUser = JSONObject.parseObject(object.getString("form")).getString("commentUser"); + String lawsProveEngineer = object.getString("lawsProveEngineerId"); + String commentUser = object.getString("commentUser"); if ("0".equalsIgnoreCase(object.getString("actionFlag"))) { delegateTask.setVariable("lawsProveEngineerId",lawsProveEngineer); 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 67760ca2..70e5fc05 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 @@ -67,25 +67,27 @@ public class EngineerReviewAfter implements TaskListener { delegateTask.setVariable("count",commentCount); Collection commentUserList=delegateTask.getVariable("commentUserList",Collection.class); - if(commentCount>=commentUserList.size()){ - // 存储当前节点意见 - 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); - } + // 存储当前节点意见 + BusProcessNew busProcessNewHis = new BusProcessNew(); + busProcessNewHis.setMsgType("clause"); + busProcessNewHis.setPId(delegateTask.getProcessInstanceId()); + busProcessNewHis.setMesg(object.toJSONString()); + busProcessNewHis.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewHis.setTaskId(delegateTask.getId()); + busProcessNewHis.setCommitText(object.getString("commentText")); + busProcessNewHis.setFinishFlag("0"); + busProcessNewHis.setTaskInfo(delegateTask.getName()); + busBean.save(busProcessNewHis); + if(StringUtils.isNotBlank(object.getString("actionFlag"))){ - String lawsProveEngineer = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId"); - String commentUser = JSONObject.parseObject(object.getString("form")).getString("commentUser"); + String lawsProveEngineer = object.getString("lawsProveEngineerId"); + String commentUser = object.getString("commentUser"); if ("0".equalsIgnoreCase(object.getString("actionFlag"))) { + delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineer); + nextUserList.add(lawsProveEngineer); + JSONArray commentCollectionList =delegateTask.getVariable("commentCollectionList", JSONArray.class); if (commentCollectionList==null) { commentCollectionList=new JSONArray(); @@ -93,10 +95,26 @@ public class EngineerReviewAfter implements TaskListener { commentCollectionList.addAll(object.getJSONArray("info")); delegateTask.setVariable("commentCollectionList",commentCollectionList); - delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineer); - nextUserList.add(lawsProveEngineer); - BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList); + if(commentCount>=commentUserList.size()){ + funEnd(delegateTask, busBean, queryWrapper, object, prcName); + if(!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); + } + } + }else { + funEnd(delegateTask, busBean, queryWrapper, object, prcName); + } delegateTask.setVariable("lawsProveEngineerVerify", 0); } else { BusProcessNew busProcessNew = new BusProcessNew(); @@ -119,6 +137,25 @@ public class EngineerReviewAfter implements TaskListener { } } + private void funEnd(DelegateTask delegateTask, IBusProcessNewService busBean, QueryWrapper queryWrapper, JSONObject object, String prcName) { + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + queryWrapper.isNotNull("PRC_NAME"); + List list = busBean.list(queryWrapper1); + if (!list.isEmpty()) { + BusProcessNew one2 = list.get(0); + one2.setMsgType("clause"); + one2.setPId(delegateTask.getProcessInstanceId()); + one2.setMesg(object.toJSONString()); + one2.setFinishFlag("0"); + one2.setTaskInfo(delegateTask.getName()); + one2.setPrcName(prcName); + one2.setCommitFlag("0"); + one2.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one2); + } + } + private String verifyObj(String str){ return (str == null || str.equals("")) ? "" : str; } 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 7230b8c8..cf77ba09 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 @@ -38,13 +38,11 @@ public class EngineerRevisionAfter implements TaskListener { List nextUserList = new ArrayList(); - JSONObject form = JSONObject.parseObject(object.getString("form")); - String lawsProveMinister = JSONObject.parseObject(form.getString("form")).getString("lawsProveMinisterId"); + String lawsProveMinister = object.getString("lawsProveMinisterId"); if(StringUtils.isNotBlank(lawsProveMinister)){ delegateTask.setVariable("lawsProveMinisterId",lawsProveMinister); - nextUserList= Arrays.asList(lawsProveMinister.split(",")); - delegateTask.addCandidateUsers(nextUserList); + nextUserList.add(lawsProveMinister); } 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 d4d1d07b..404ef84d 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 @@ -35,7 +35,7 @@ public class FillCommentAfter implements TaskListener { Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); - String responseDocker = JSONObject.parseObject(object.getString("form")).getString("responseDockerId"); + String responseDocker = object.getString("responseDockerId"); delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); 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 140c77d7..0a87c4aa 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 @@ -60,8 +60,8 @@ public class MinisterReviewAfter implements TaskListener { } if(StringUtils.isNotBlank(object.getString("actionFlag"))){ - String lawsProveViceChief = JSONObject.parseObject(object.getString("form")).getString("lawsProveViceChiefId"); - String lawsProveEngineerId2 = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId"); + String lawsProveViceChief = object.getString("lawsProveViceChiefId"); + String lawsProveEngineerId2 = object.getString("lawsProveEngineerId"); if ("0".equalsIgnoreCase(object.getString("actionFlag"))) { 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 cfe241af..bae4c86d 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 @@ -59,8 +59,8 @@ public class ViceDirectorAfter implements TaskListener { } if(StringUtils.isNotBlank(object.getString("actionFlag"))){ - String lawsProveChief = JSONObject.parseObject(object.getString("form")).getString("lawsProveChiefId"); - String lawsProveEngineerId2 = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId"); + String lawsProveChief = object.getString("lawsProveChiefId"); + String lawsProveEngineerId2 = object.getString("lawsProveEngineerId"); if ("0".equalsIgnoreCase(object.getString("actionFlag"))) {