From f54137d3385c3144673bb3f6cdf191519aa546e7 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 27 Dec 2021 11:14:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E7=A0=94=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=B8=A2=E6=95=B0=E6=8D=AEbug=E4=BF=AE=E5=A4=8D---=E3=80=8B?= =?UTF-8?q?=E6=9C=AA=E5=81=9A=E5=A4=9A=E5=AE=9E=E4=BE=8B=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/StandardSurvey/SelectResponsibleUserAfter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java index a9f23a95..628b50ca 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java @@ -111,7 +111,7 @@ public class SelectResponsibleUserAfter implements TaskListener { count++; delegateTask.setVariable("selectResponCount",count); -// if(count>=delegateTask.getVariable("dockUserList",List.class).size()){ + if(count>=delegateTask.getVariable("dockUserList",List.class).size()){ if(!responUserList.isEmpty()){ for (int i = 0; i < responUserList.size(); i++) { JSONObject jsonObject = responUserList.getJSONObject(i); @@ -127,7 +127,7 @@ public class SelectResponsibleUserAfter implements TaskListener { busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } -// } + } } // throw new ActivitiException("dahsdgadiauhfugauyfgqffiygv"); } From 70c91caba04befd8511655ebad772a23bbf72562 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 27 Dec 2021 14:59:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=B0=83=E7=A0=94?= =?UTF-8?q?=E6=B5=81=E7=A8=8B---=E3=80=8B=E5=8D=95=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=8F=98=E5=A4=9A=E8=8A=82=E7=82=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardSurvey/DirectorSignAfter.java | 38 ++++++++++--------- .../MinisterAndDockerSignAfter.java | 15 ++------ .../StandardSurvey/ResponUserSignAfter.java | 2 +- 3 files changed, 25 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java index 497cd854..bab5ae76 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java @@ -32,11 +32,24 @@ public class DirectorSignAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); - + //设置一个计数器 + if (null!=delegateTask.getVariable("countSign",Integer.class)){ + delegateTask.setVariable("countSign",delegateTask.getVariable("countSign",Integer.class)+1); + }else { + delegateTask.setVariable("countSign",1); + } if (delegateTask.getVariable("actionFlag", Integer.class) == 0) { if ("1".equals(object.getString("actionFlag"))) { delegateTask.setVariable("actionFlag", 1); - nextUserList.add(delegateTask.getVariable("startUser",String.class)); + delegateTask.setVariable("7Mark","false"); + }else { + delegateTask.setVariable("actionFlag",0); + if (delegateTask.getVariable("countSign",Integer.class)==1){ + delegateTask.setVariable("7Mark","true"); + } + else if ("true"==delegateTask.getVariable("7Mark",String.class)){ + delegateTask.setVariable("7Mark","true"); + } } } @@ -72,22 +85,9 @@ public class DirectorSignAfter implements TaskListener { updataWapper.eq("TASK_ID",delegateTask.getId()); updataWapper.eq("P_ID",delegateTask.getProcessInstanceId()); busBean.update(busProcessNew,updataWapper); - - 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); - } - } else { - if (delegateTask.getVariable("actionFlag", Integer.class) == 0) { + if (delegateTask.getVariable("countSign",Integer.class)>=delegateTask.getVariable("directorUserList",List.class).size()) { + if ("true".equals(delegateTask.getVariable("7Mark", String.class))) { + delegateTask.setVariable("actionFlag", 0); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -98,6 +98,8 @@ public class DirectorSignAfter implements TaskListener { busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } else { + delegateTask.setVariable("actionFlag", 1); + delegateTask.setVariable("countSign",0); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java index 46e723a9..aab49c3c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java @@ -14,6 +14,7 @@ import org.activiti.engine.delegate.TaskListener; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; @@ -99,29 +100,21 @@ public class MinisterAndDockerSignAfter implements TaskListener { if (gose+1==userList.size()) { if (count >= userList.size()) { if (delegateTask.getVariable("actionFlag", Integer.class) == 0) { + nextUserList.addAll(new ArrayList<>(Arrays.asList(delegateTask.getVariable("directorUser", String.class).split(",")))); + delegateTask.setVariable("directorUserList",nextUserList); 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.setTaskInfo("技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定"); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(nextUser); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } - } else { - BusProcessNew busProcessNewNext = new BusProcessNew(); - busProcessNewNext.setMsgType("clause"); - busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo("技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定"); - busProcessNewNext.setUserId(delegateTask.getVariable("directorUser", String.class)); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); } } else { BusProcessNew busProcessNewNext = new BusProcessNew(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java index 8f41809c..7d0c452e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java @@ -96,7 +96,7 @@ public class ResponUserSignAfter implements TaskListener { count++; delegateTask.setVariable("task2OKCount",count); } - if(count>=responUserList.size()){ + if(count>=delegateTask.getVariable("responUserLists",List.class).size()){ if(delegateTask.getVariable("actionFlag",Integer.class)==0){ if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){