From 6d9cd8ffb4eb7d27a9542a6be53131968a11fcaf Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 4 Nov 2021 17:52:46 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=A0=87=E8=AE=B0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=B8=BA=E4=BA=8B=E4=B8=9A=E9=83=A8=E8=BF=98=E6=98=AF=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E8=A7=84=E5=88=92=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionAfter.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) 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 f1100089..ea7e09be 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 @@ -36,31 +36,27 @@ public class DistributionAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); + Map departmentMap = new HashMap<>(); //用户--用户所属部门 if(StringUtils.isNotBlank(object.getString("responUserList"))){ nextUserList= Arrays.asList(object.getString("responUserList").split(",")); + JSONArray mapArray = object.getJSONArray("responUserAndInstitutionNameMap"); + for (Object jsonMap : mapArray) { + departmentMap.putAll(JSONObject.parseObject(jsonMap.toString(), Map.class)); + + } // 配置多实例 delegateTask.setVariable("commentUserList",nextUserList); delegateTask.addCandidateUsers(nextUserList); } - JSONArray userListJson= JSON.parseArray(delegateTask.getVariable("responUserListInfo",String.class)); - if(userListJson==null)userListJson=new JSONArray(); - List strings=new ArrayList<>(); - Map map=new HashMap<>(); - for (int i = 0; i < nextUserList.size(); i++) { - JSONObject json=new JSONObject(); - json.put("id",nextUserList.get(i)); - json.put("name",nextUserList.get(i)); - json.put("dockUser",delegateTask.getAssignee()); - json.put("info",new JSONArray()); - userListJson.add(json); - strings.add(nextUserList.get(i)); - map.put(nextUserList.get(i),json); - } + JSONArray commentCollectionList=delegateTask.getVariable("commentCollectionList",JSONArray.class); + if (commentCollectionList==null) commentCollectionList=new JSONArray(); + delegateTask.setVariable("commentCollectionList",commentCollectionList); + @@ -97,10 +93,14 @@ public class DistributionAfter implements TaskListener { if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ + //标记此用户是事业部还是产品规划部 + JSONObject repositoryObject =object; + repositoryObject.put("department",departmentMap.get(nextUser)); + BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setMesg(repositoryObject.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); From 25536df1aae4e31454229d4fdf0f5c86b8f2bbde Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 4 Nov 2021 17:54:01 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wkflow/listener/KCSTPReviewProcess/DistributionAfter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/DistributionAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/DistributionAfter.java index d05c4b4e..f216d141 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/DistributionAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/DistributionAfter.java @@ -89,8 +89,8 @@ public class DistributionAfter implements TaskListener { if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ + //标记此用户是事业部还是产品规划部 JSONObject repositoryObject =object; -// TODO if(object.getString("")); if (userAndInstitutionNameMap.get(nextUser).contains("事业部")){ repositoryObject.put("feedbackDept","1"); prcName+="-责任人反馈事业部情况"; From 72de3865f7544455a4cc27b750f2a0ed8eca2d24 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 4 Nov 2021 17:55:49 +0800 Subject: [PATCH 3/8] commit --- .../listener/StandardCommentProcess/DockingApprovalAfter.java | 2 +- .../wkflow/listener/policyCommentProcess/DockerReviewAfter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java index 080b05e4..44f9d6cb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java @@ -105,4 +105,4 @@ public class DockingApprovalAfter implements TaskListener { busBean.save(busProcessNewNext); } } -} \ No newline at end of file +} 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 dd57a56e..96f93b90 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 @@ -56,7 +56,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); From ac879208a4c38798e6ad038f68162a2a5f069d3f Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 4 Nov 2021 17:57:29 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B1=87=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EngineerRevisionBefore.java | 14 ++++++++++++++ .../policyCommentProcess/FillCommentAfter.java | 11 +++++++++++ 2 files changed, 25 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionBefore.java index d1543447..c0b22a0a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionBefore.java @@ -1,5 +1,8 @@ package com.ydw.bat.wkflow.listener.policyCommentProcess; +import com.alibaba.fastjson.JSON; +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.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; @@ -27,6 +30,17 @@ public class EngineerRevisionBefore implements TaskListener { BusProcessNew one1 = list.get(0); one1.setTaskId(delegateTask.getId()); one1.setTaskInfo(delegateTask.getName()); + + /** + * 汇总已审批通过的意见 + */ + String msg = one1.getMesg(); + JSONObject msgJsonBoj = JSON.parseObject(msg); + JSONArray commentCollectionList=delegateTask.getVariable("commentCollectionList",JSONArray.class); + msgJsonBoj.put("info",commentCollectionList); + one1.setMesg(msgJsonBoj.toJSONString()); + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 one1.setLink("bzrkStep2?prcType=laws2"); 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 78676eed..c8fbf5a1 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 @@ -1,5 +1,7 @@ package com.ydw.bat.wkflow.listener.policyCommentProcess; +import com.alibaba.fastjson.JSON; +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; @@ -39,6 +41,15 @@ public class FillCommentAfter implements TaskListener { List nextUserList = new ArrayList(); if(StringUtils.isNotBlank(responseDocker)){ + + JSONArray commentCollectionList =delegateTask.getVariable("commentCollectionList", JSONArray.class); + if (commentCollectionList==null) { + commentCollectionList=new JSONArray(); + } + commentCollectionList.addAll(object.getJSONArray("info")); + + + delegateTask.setVariable("commentCollectionList",commentCollectionList); delegateTask.setVariable("responseDockerId",responseDocker); nextUserList= Arrays.asList(responseDocker.split(",")); delegateTask.addCandidateUsers(nextUserList); From 398ab4812067684055c8690e914901a2490f525b Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 4 Nov 2021 17:58:40 +0800 Subject: [PATCH 5/8] {form:{form:{}}} --- .../EngineerReviewAfter.java | 47 ++++++++++++------- .../EngineerRevisionAfter.java | 4 +- .../MinisterReviewAfter.java | 4 +- .../ViceDirectorAfter.java | 5 +- 4 files changed, 38 insertions(+), 22 deletions(-) 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 010ee93c..4cdcd269 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 @@ -14,10 +14,7 @@ import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; /** * 工程师审核 @@ -38,8 +35,9 @@ public class EngineerReviewAfter implements TaskListener { List nextUserList = new ArrayList(); - if ("0".equals(object.getString("actionFlag"))){ - String lawsProveEngineer = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId"); + 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)){ delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineer); @@ -59,7 +57,7 @@ public class EngineerReviewAfter 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); @@ -72,17 +70,30 @@ public class EngineerReviewAfter implements TaskListener { 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); + + /** + * 当子任务结束时存储 + */ + Integer commentCount=delegateTask.getVariable("commentCount",Integer.class); + if(commentCount==null)commentCount=0; + commentCount++; + 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); + } + if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ 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 ff0055cd..768b0e5c 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,8 +38,8 @@ public class EngineerRevisionAfter implements TaskListener { List nextUserList = new ArrayList(); - - String lawsProveMinister = JSONObject.parseObject(object.getString("form")).getString("lawsProveMinisterId"); + JSONObject form = JSONObject.parseObject(object.getString("form")); + String lawsProveMinister = JSONObject.parseObject(form.getString("form")).getString("lawsProveMinisterId"); if(StringUtils.isNotBlank(lawsProveMinister)){ delegateTask.setVariable("lawsProveMinisterId",lawsProveMinister); 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 5a3cf765..36345396 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 @@ -38,7 +38,9 @@ public class MinisterReviewAfter implements TaskListener { List nextUserList = new ArrayList(); if ("0".equals(object.getString("actionFlag"))){ - String lawsProveViceChief = JSONObject.parseObject(object.getString("form")).getString("lawsProveViceChiefId"); + + JSONObject form = JSONObject.parseObject(object.getString("form")); + String lawsProveViceChief = JSONObject.parseObject(form.getString("form")).getString("lawsProveViceChiefId"); if(StringUtils.isNotBlank(lawsProveViceChief)){ delegateTask.setVariable("lawsProveMinisterVerify",0); 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 f443591e..ffd0a1ba 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 @@ -38,7 +38,10 @@ public class ViceDirectorAfter implements TaskListener { List nextUserList = new ArrayList(); if ("0".equals(object.getString("actionFlag"))){ - String lawsProveChief = JSONObject.parseObject(object.getString("form")).getString("lawsProveChiefId"); + + + JSONObject form = JSONObject.parseObject(object.getString("form")); + String lawsProveChief = JSONObject.parseObject(form.getString("form")).getString("lawsProveChiefId"); if(StringUtils.isNotBlank(lawsProveChief)){ delegateTask.setVariable("lawsProveViceChiefVerify",0); From 9c14008801d92eaedf3639d80be47e96c4c6b0e6 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 4 Nov 2021 17:59:38 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E9=87=8D=E5=90=AF=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bat/wkflow/listener/KCSTPReviewProcess/ReLaunchAfter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/ReLaunchAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/ReLaunchAfter.java index 71dbf067..e670127d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/ReLaunchAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/ReLaunchAfter.java @@ -78,7 +78,7 @@ public class ReLaunchAfter implements TaskListener { busProcessNew.setCommitText(object.getString("commentText")); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.save(busProcessNew); + busBean.saveOrUpdate(busProcessNew); if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ From e10244d815fe52f48929df48907f578892e65d92 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 5 Nov 2021 09:52:17 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=A1=AB?= =?UTF-8?q?=E5=86=99=E6=84=8F=E8=A7=81=E5=90=8E=E8=A2=AB=E7=BB=A7=E7=BB=AD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A0=E6=B3=95=E6=B1=87=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../policyCommentProcess/EngineerReviewAfter.java | 9 +++++++++ .../listener/policyCommentProcess/FillCommentAfter.java | 7 ------- 2 files changed, 9 insertions(+), 7 deletions(-) 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 4cdcd269..331be057 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 @@ -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; @@ -40,6 +41,14 @@ public class EngineerReviewAfter implements TaskListener { 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); 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 c8fbf5a1..c774bc6a 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 @@ -42,14 +42,7 @@ public class FillCommentAfter implements TaskListener { if(StringUtils.isNotBlank(responseDocker)){ - JSONArray commentCollectionList =delegateTask.getVariable("commentCollectionList", JSONArray.class); - if (commentCollectionList==null) { - commentCollectionList=new JSONArray(); - } - commentCollectionList.addAll(object.getJSONArray("info")); - - delegateTask.setVariable("commentCollectionList",commentCollectionList); delegateTask.setVariable("responseDockerId",responseDocker); nextUserList= Arrays.asList(responseDocker.split(",")); delegateTask.addCandidateUsers(nextUserList); From 2184de25391d2ad452bbc1ca34be5407e8fce8ec Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sun, 7 Nov 2021 11:06:03 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=20-=20=E6=B5=81=E7=A8=8B=E9=80=BB=E8=BE=91?= =?UTF-8?q?=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardCommentProcess/MinisterAndDockerSignAfter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java index 153a7dd2..81f1b8f9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java @@ -98,9 +98,8 @@ public class MinisterAndDockerSignAfter implements TaskListener { Integer count=delegateTask.getVariable("task3OKCount",Integer.class); List userList=delegateTask.getVariable("userList",List.class); - + if(count==null)count=0; if(delegateTask.getVariable("actionFlag",Integer.class)==0){ - if(count==null)count=0; count++; delegateTask.setVariable("task3OKCount",count); }