From 53e05290c83dde5cff5a14cdb4532972ef6fb50d Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Fri, 30 Jul 2021 15:25:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=EF=BC=9A=E6=A0=87=E5=87=86=E8=A7=A3?= =?UTF-8?q?=E8=AF=BB=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wkflow/listener/standardRead/ChooseZrAfter.java | 10 +++++++--- .../listener/standardRead/DeptApplayAfter.java | 10 +++++++--- .../wkflow/listener/standardRead/DeptZrAfter.java | 10 +++++++--- .../listener/standardRead/EngineerApplayAfter.java | 12 ++++++++---- .../wkflow/listener/standardRead/ExpainAfter.java | 10 +++++++--- .../wkflow/listener/standardRead/ResolveAfter.java | 10 +++++++--- .../wkflow/listener/standardRead/ZrApplayAfter.java | 10 +++++++--- 7 files changed, 50 insertions(+), 22 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 7e94f0fe..5a962098 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 @@ -46,10 +46,14 @@ public class ChooseZrAfter implements TaskListener{ String user = object.getString("applyUserId"); String username = object.getString("applyUserIdName"); String standName = ""; - if(object.getString("standInData").equals("0")){ - standName = "国内"; + if (null == object.getString("standInData")){ + standName = "未知"; }else { - standName = "国外"; + if(object.getString("standInData").equals("INLAND")){ + standName = "国内"; + }else { + standName = "国外"; + } } String prcName = standName+"-标准解读流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); 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 194ea7a2..97eea31d 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 @@ -47,10 +47,14 @@ public class DeptApplayAfter implements TaskListener{ String user = object.getString("applyUserId"); String username = object.getString("applyUserIdName"); String standName = ""; - if(object.getString("standInData").equals("INLAND")){ - standName = "国内"; + if (null == object.getString("standInData")){ + standName = "未知"; }else { - standName = "国外"; + if(object.getString("standInData").equals("INLAND")){ + standName = "国内"; + }else { + standName = "国外"; + } } String prcName = standName+"-标准解读流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); 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 9d23ca09..c63b7d0a 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 @@ -58,10 +58,14 @@ public class DeptZrAfter implements TaskListener{ String user = object.getString("applyUserId"); String username = object.getString("applyUserIdName"); String standName = ""; - if(object.getString("standInData").equals("INLAND")){ - standName = "国内"; + if (null == object.getString("standInData")){ + standName = "未知"; }else { - standName = "国外"; + if(object.getString("standInData").equals("INLAND")){ + standName = "国内"; + }else { + standName = "国外"; + } } String prcName = standName+"-标准解读流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); 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 f009f8a5..22022502 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 @@ -51,10 +51,14 @@ public class EngineerApplayAfter implements TaskListener{ String user = object.getString("applyUserId"); String username = object.getString("applyUserIdName"); String standName = ""; - if (object.getString("standInData").equals("INLAND")) { - standName = "国内"; - } else { - standName = "国外"; + if (null == object.getString("standInData")){ + standName = "未知"; + }else { + if(object.getString("standInData").equals("INLAND")){ + standName = "国内"; + }else { + standName = "国外"; + } } String prcName = standName + "-标准解读流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); 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 d58fc030..85d48e10 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 @@ -42,10 +42,14 @@ public class ExpainAfter implements TaskListener{ String user = object.getString("applyUserId"); String username = object.getString("applyUserIdName"); String standName = ""; - if(object.getString("standInData").equals("INLAND")){ - standName = "国内"; + if (null == object.getString("standInData")){ + standName = "未知"; }else { - standName = "国外"; + if(object.getString("standInData").equals("INLAND")){ + standName = "国内"; + }else { + standName = "国外"; + } } String prcName = standName+"-标准解读流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); 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 24d10c6e..87002808 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 @@ -52,10 +52,14 @@ public class ResolveAfter implements TaskListener{ String user = object.getString("applyUserId"); String username = object.getString("applyUserIdName"); String standName = ""; - if(object.getString("standInData").equals("INLAND")){ - standName = "国内"; + if (null == object.getString("standInData")){ + standName = "未知"; }else { - standName = "国外"; + if(object.getString("standInData").equals("INLAND")){ + standName = "国内"; + }else { + standName = "国外"; + } } String prcName = standName+"-标准解读流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); 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 4182b5c5..7c3546aa 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 @@ -50,10 +50,14 @@ public class ZrApplayAfter implements TaskListener{ String user = object.getString("applyUserId"); String username = object.getString("applyUserIdName"); String standName = ""; - if(object.getString("standInData").equals("INLAND")){ - standName = "国内"; + if (null == object.getString("standInData")){ + standName = "未知"; }else { - standName = "国外"; + if(object.getString("standInData").equals("INLAND")){ + standName = "国内"; + }else { + standName = "国外"; + } } String prcName = standName+"-标准解读流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); From 134e552d4e3897b052d73888aa864fddf81fac0f Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Fri, 30 Jul 2021 17:36:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=20=EF=BC=81=EF=BC=81?= =?UTF-8?q?=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SelectResponsibleUserAfter.java | 25 ++++++++++++------- .../UploadResearchResultAfter.java | 6 ++--- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java index 8c684df9..0353e8f6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java @@ -57,6 +57,9 @@ public class SelectResponsibleUserAfter implements TaskListener { 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 < responUserList.size()&&i=dockUserList.size()){ - Collection values = userListJson; - Collection> respon=new ArrayList<>(); - for (Object value : values) { - respon.add(((JSONObject)value).getInnerMap()); - } - delegateTask.setVariable("zqazqazqaUserList",respon); +// Collection values = userListJson; +// Collection> respon=new ArrayList<>(); +// for (Object value : values) { +// respon.add(((JSONObject)value).getInnerMap()); +// } + delegateTask.setVariable("zqazqazqaUserList",strings); + delegateTask.setVariable("datas",map); if(nextUserList != null && !nextUserList.isEmpty()){ List busProcessNews=new ArrayList<>(); - for(Map zqa : respon){ + for(String zqa : strings){ BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - object.put("dockUser",(String)zqa.get("dockUser")); +// object.put("dockUser",(String)zqa.get("dockUser")); + object.put("dockUser",map.get(zqa).getString("dockUser")); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId((String) zqa.get("id")); + busProcessNewNext.setUserId(map.get(zqa).getString("id")); busProcessNews.add(busProcessNewNext); } busBean.saveBatch(busProcessNews); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java index 33fdbfcb..9bc5dbff 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java @@ -35,7 +35,6 @@ public class UploadResearchResultAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); - JSONArray responUserListInfo = JSON.parseArray(delegateTask.getVariable("responUserListInfo", String.class)); for (int i=0;i