From 6fee276ad3cea3c42482b755087acdf37aebfa9e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 12 Aug 2021 10:27:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?bug=2046474=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MinisterAndDockerSignAfter.java | 58 ++++++++++++------- 1 file changed, 38 insertions(+), 20 deletions(-) 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 9e1c00bb..f9e07e6f 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 @@ -36,7 +36,7 @@ public class MinisterAndDockerSignAfter implements TaskListener { if(delegateTask.getVariable("actionFlag",Integer.class)==0){ if("1".equals(object.getString("actionFlag"))){ delegateTask.setVariable("actionFlag",1); - nextUserList.add(delegateTask.getVariable("startUser",String.class)); +// nextUserList.add(delegateTask.getVariable("startUser",String.class)); } } @@ -82,6 +82,10 @@ public class MinisterAndDockerSignAfter implements TaskListener { busBean.update(busProcessNew,updataWapper); Integer count=delegateTask.getVariable("task3OKCount",Integer.class); + Integer gose=0; + if (null!=delegateTask.getVariable("task3Count",Integer.class)){ + gose=delegateTask.getVariable("task3Count",Integer.class); + } List userList=delegateTask.getVariable("userList",List.class); if(delegateTask.getVariable("actionFlag",Integer.class)==0){ @@ -89,40 +93,54 @@ public class MinisterAndDockerSignAfter implements TaskListener { count++; delegateTask.setVariable("task3OKCount",count); } - if(count>=userList.size()){ - if(delegateTask.getVariable("actionFlag",Integer.class)==0){ - if(nextUserList != null && !nextUserList.isEmpty()){ - for(String nextUser : nextUserList){ + delegateTask.setVariable("task3Count",gose+1); + if (gose+1==userList.size()) { + if (count >= userList.size()) { + if (delegateTask.getVariable("actionFlag", Integer.class) == 0) { + 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); + busBean.save(busProcessNewNext); + } + } else { 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.setTaskInfo("技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定"); + busProcessNewNext.setUserId(delegateTask.getVariable("directorUser", String.class)); busBean.save(busProcessNewNext); } - }else { + } 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.setTaskInfo("标准法规工程师调研汇总"); + busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class)); 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("startUser", String.class)); - busBean.save(busProcessNewNext); + }else { + 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(delegateTask.getVariable("startUser",String.class)); + busBean.save(busProcessNewNext); } + delegateTask.setVariable("task3Count",0); } } From 2f2dc9e5e279f688110c7561c9e4c47db81d37c5 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 12 Aug 2021 10:29:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?bug=2046634=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java | 2 +- .../ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java | 2 +- .../com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java | 2 +- .../bat/wkflow/listener/standardRead/EngineerApplayAfter.java | 2 +- .../com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java | 2 +- .../com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java | 2 +- .../com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java index 5a962098..35d305c8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java @@ -52,7 +52,7 @@ public class ChooseZrAfter implements TaskListener{ if(object.getString("standInData").equals("INLAND")){ standName = "国内"; }else { - standName = "国外"; + standName = "海外"; } } String prcName = standName+"-标准解读流程"; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java index 751f52e7..43b29c29 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java @@ -98,7 +98,7 @@ public class DeptApplayAfter implements TaskListener{ if(object.getString("standInData").equals("INLAND")){ standName = "国内"; }else { - standName = "国外"; + standName = "海外"; } } String prcName = standName+"-标准解读流程"; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java index c63b7d0a..801fd182 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java @@ -64,7 +64,7 @@ public class DeptZrAfter implements TaskListener{ if(object.getString("standInData").equals("INLAND")){ standName = "国内"; }else { - standName = "国外"; + standName = "海外"; } } String prcName = standName+"-标准解读流程"; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java index 22022502..78649c64 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java @@ -57,7 +57,7 @@ public class EngineerApplayAfter implements TaskListener{ if(object.getString("standInData").equals("INLAND")){ standName = "国内"; }else { - standName = "国外"; + standName = "海外"; } } String prcName = standName + "-标准解读流程"; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java index 85d48e10..df714d1c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java @@ -48,7 +48,7 @@ public class ExpainAfter implements TaskListener{ if(object.getString("standInData").equals("INLAND")){ standName = "国内"; }else { - standName = "国外"; + standName = "海外"; } } String prcName = standName+"-标准解读流程"; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java index 3d633f2c..f962768e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java @@ -59,7 +59,7 @@ public class ResolveAfter implements TaskListener{ if(object.getString("standInData").equals("INLAND")){ standName = "国内"; }else { - standName = "国外"; + standName = "海外"; } } String prcName = standName+"-标准解读流程"; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java index ccdfb5d9..c9b31f62 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java @@ -59,7 +59,7 @@ public class ZrApplayAfter implements TaskListener{ if(object.getString("standInData").equals("INLAND")){ standName = "国内"; }else { - standName = "国外"; + standName = "海外"; } } String prcName = standName+"-标准解读流程"; From 78bbd4e9f01c96833b9c0bc0dc5d71c9c5de646c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 12 Aug 2021 10:46:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20=2046476?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bat/wkflow/listener/standardRead/EngineerApplayAfter.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java index 78649c64..5803a3e9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java @@ -45,6 +45,8 @@ public class EngineerApplayAfter implements TaskListener{ } } else { delegateTask.setVariable("gcFlag", 2); + JSONObject object1=delegateTask.getVariable("zxUserId",JSONObject.class); + nextUserList.add(object1.getString("id")); } //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());