From 572ff912cf7d636d789b1e2ce84c6b05810ce52d Mon Sep 17 00:00:00 2001 From: yinglong zhang <1679309912@qq.com> Date: Wed, 14 Jul 2021 14:58:47 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=9C=AA=E5=90=88=E8=A7=84=E6=95=B4?= =?UTF-8?q?=E6=94=B9=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SelectResponUserAfter.java | 1 - .../StandardSurvey/DirectorSignAfter.java | 48 +++++++------------ .../StandardSurvey/DockingApprovalAfter.java | 5 +- .../MinisterAndDockerSignAfter.java | 35 +++++--------- .../StandardSurvey/PresidentSignAfter.java | 13 ----- .../StandardSurvey/ResponUserSignAfter.java | 14 +++--- .../StandardSurvey/ResponUserSignBefore.java | 1 + .../SelectResponsibleUserAfter.java | 44 ++++++++--------- .../SelectResponsibleUserBefore.java | 2 + .../StandardSurvey/StartSurveyAfter.java | 28 +++++++---- .../StandardSurvey/SummarySurveyAfter.java | 11 +++-- .../UploadResearchResultAfter.java | 30 ++++-------- 12 files changed, 94 insertions(+), 138 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java index 98a2cfc4..8234b0ee 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java @@ -76,7 +76,6 @@ public class SelectResponUserAfter implements TaskListener { jsonObject.put("dockUser",preResponUser.getString("dockUser")); jsonObject.put("info",standardInfoList.get(i)); - responUserList.add(jsonObject); } } 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 be622c35..47ebf5cc 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 @@ -75,38 +75,24 @@ public class DirectorSignAfter implements TaskListener { 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); - busBean.save(busProcessNewNext); - } + if (delegateTask.getVariable("actionFlag", Integer.class) == 0) { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo("工程研究总院院长批准"); + busProcessNewNext.setUserId(delegateTask.getVariable("presidentUser", JSONObject.class).getString("id")); + busBean.save(busProcessNewNext); } else { - if (delegateTask.getVariable("actionFlag", Integer.class) == 0) { - BusProcessNew busProcessNewNext = new BusProcessNew(); - busProcessNewNext.setMsgType("clause"); - busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo("工程研究总院院长批准"); - busProcessNewNext.setUserId(delegateTask.getVariable("presidentUser", 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); - } + 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", JSONObject.class).getString("id")); + busBean.save(busProcessNewNext); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java index 691a469f..9fe60574 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.StandardSurvey; + 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; @@ -90,7 +91,7 @@ public class DockingApprovalAfter implements TaskListener { if(delegateTask.getVariable("actionFlag",Integer.class)==0){ Integer count=delegateTask.getVariable("task1Count",Integer.class); - List responUserList=delegateTask.getVariable("responUserList",List.class); + JSONArray responUserList=delegateTask.getVariable("responUserList",JSONArray.class); if(count==null)count=0; count++; delegateTask.setVariable("task1Count",count); @@ -102,7 +103,7 @@ public class DockingApprovalAfter implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo("标准法规工程师调研汇总"); - busProcessNewNext.setUserId(delegateTask.getVariable("startUser",String.class)); + busProcessNewNext.setUserId(delegateTask.getVariable("startUser",JSONObject.class).getString("id")); busBean.save(busProcessNewNext); } 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 d4ee35cc..ce98aa12 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 @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.StandardSurvey; +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; @@ -82,7 +83,7 @@ public class MinisterAndDockerSignAfter implements TaskListener { busBean.update(busProcessNew,updataWapper); Integer count=delegateTask.getVariable("task3OKCount",Integer.class); - List userList=delegateTask.getVariable("userList",List.class); + JSONArray userList=delegateTask.getVariable("userList",JSONArray.class); if(delegateTask.getVariable("actionFlag",Integer.class)==0){ if(count==null)count=0; @@ -91,28 +92,14 @@ public class MinisterAndDockerSignAfter implements TaskListener { } 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.setFinishFlag("0"); - busProcessNewNext.setTaskInfo("技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定"); - busProcessNewNext.setUserId(delegateTask.getVariable("directorUser", String.class)); - busBean.save(busProcessNewNext); - } + 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",JSONObject.class).getString("id")); + busBean.save(busProcessNewNext); }else{ BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); @@ -120,7 +107,7 @@ public class MinisterAndDockerSignAfter implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo("标准法规工程师调研汇总"); - busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class)); + busProcessNewNext.setUserId(delegateTask.getVariable("startUser",JSONObject.class).getString("id")); busBean.save(busProcessNewNext); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java index 6a4cd80c..4e3d990a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java @@ -74,18 +74,5 @@ public class PresidentSignAfter implements TaskListener { 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); - busBean.save(busProcessNewNext); - } - } } } 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 895a5bc2..68a2db61 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 @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.StandardSurvey; +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; @@ -32,9 +33,9 @@ public class ResponUserSignAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); - List userList=delegateTask.getVariable("userList",List.class); - String startUser=delegateTask.getVariable("startUser",String.class); + JSONArray nextUserList = new JSONArray(); + JSONArray userList=delegateTask.getVariable("userList",JSONArray.class); + JSONObject startUser=delegateTask.getVariable("startUser",JSONObject.class); if(delegateTask.getVariable("actionFlag",Integer.class)==0){ if("1".equals(object.getString("actionFlag"))){ @@ -98,7 +99,8 @@ public class ResponUserSignAfter implements TaskListener { if(count>=responUserList.size()){ if(delegateTask.getVariable("actionFlag",Integer.class)==0){ if(nextUserList != null && !nextUserList.isEmpty()){ - for(String nextUser : nextUserList){ + for (int i = 0; i < nextUserList.size(); i++) { + JSONObject nextUser=nextUserList.getJSONObject(i); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -106,7 +108,7 @@ public class ResponUserSignAfter implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setUserId(nextUser.getString("id")); busBean.save(busProcessNewNext); } } @@ -117,7 +119,7 @@ public class ResponUserSignAfter implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo("标准法规工程师调研汇总"); - busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class)); + busProcessNewNext.setUserId(delegateTask.getVariable("startUser", JSONObject.class).getString("id")); busBean.save(busProcessNewNext); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignBefore.java index 64ed8384..b36328dc 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignBefore.java @@ -15,6 +15,7 @@ public class ResponUserSignBefore implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.isNull("TASK_ID"); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ 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 727381d6..e7b1bafc 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 @@ -33,31 +33,20 @@ public class SelectResponsibleUserAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); - String userListString=object.getString("responUserList"); - String userListStringName=object.getString("responUserListName"); + JSONArray nextUserList = new JSONArray(); - List userList = Arrays.asList(userListString.split(",")); - for (int i = 0; i < userList.size(); i++) { - nextUserList.add(userList.get(i).trim()); + JSONArray preResponUserList = object.getJSONArray("responUserList"); + JSONArray responUserList=delegateTask.getVariable("responUserList",JSONArray.class); + if(responUserList==null)responUserList=new JSONArray(); + for (int i = 0; i < preResponUserList.size(); i++) { + JSONObject preResponUser=preResponUserList.getJSONObject(i); + preResponUser.put("dockUser",delegateTask.getAssignee()); + responUserList.add(preResponUser); } - List userListName=Arrays.asList(userListStringName.split(",")); - List newUserListName = new ArrayList(); - userListName.forEach((String name)->{ - newUserListName.add(name.trim()); - }); - JSONObject userListJson=new JSONObject(); - for (int i = 0; i < userList.size(); i++) { - JSONObject json=new JSONObject(); - json.put("id",userList.get(i)); - json.put("name",newUserListName.get(i)); - userListJson.put(userList.get(i),json); - } - delegateTask.setVariable("responUserListMap",userListJson.toJSONString()); - - delegateTask.setVariable("responUserList",nextUserList); + delegateTask.setVariable("responUserList",responUserList); + nextUserList=responUserList; //截止时间 流程描述 创建人 @@ -95,8 +84,14 @@ public class SelectResponsibleUserAfter implements TaskListener { updataWapper.eq("P_ID",delegateTask.getProcessInstanceId()); busBean.update(busProcessNew,updataWapper); - if(nextUserList != null && !nextUserList.isEmpty()){ - for(String nextUser : nextUserList){ + Integer count=delegateTask.getVariable("selectResponCount",Integer.class); + if(count==null)count=0; + count++; + delegateTask.setVariable("selectResponCount",count); + + if(count>=delegateTask.getVariable("dockUserList",JSONArray.class).size()){ + for (int i = 0; i < nextUserList.size(); i++) { + JSONObject nextUser=nextUserList.getJSONObject(i); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -104,9 +99,10 @@ public class SelectResponsibleUserAfter implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setUserId(nextUser.getString("id")); busBean.save(busProcessNewNext); } } + } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserBefore.java index 96b280ee..3ac24d7b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserBefore.java @@ -16,6 +16,8 @@ public class SelectResponsibleUserBefore implements TaskListener { QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.isNull("TASK_ID"); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java index 46d05c2d..2fca5a19 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.StandardSurvey; +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; @@ -34,21 +35,25 @@ public class StartSurveyAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); - List userList=new ArrayList<>(); + JSONArray nextUserList = new JSONArray(); + JSONArray userList=new JSONArray(); - delegateTask.setVariable("startUser",object.getString("startUser")); - delegateTask.setVariable("dockUser",object.getString("dockUser")); - delegateTask.setVariable("ministerUser",object.getString("ministerUser")); - delegateTask.setVariable("directorUser",object.getString("directorUser")); - delegateTask.setVariable("presidentUser",object.getString("presidentUser")); + delegateTask.setVariable("startUser",object.getJSONObject("startUser")); + delegateTask.setVariable("ministerUser",object.getJSONObject("ministerUser")); + delegateTask.setVariable("directorUser",object.getJSONObject("directorUser")); + delegateTask.setVariable("presidentUser",object.getJSONObject("presidentUser")); - userList.add(object.getString("dockUser")); + delegateTask.setVariable("dockUserList",object.getJSONArray("dockUserList")); + + userList.addAll(object.getJSONArray("dockUserList")); userList.add(object.getString("ministerUser")); delegateTask.setVariable("userList",userList); delegateTask.setVariable("actionFlag",0); + delegateTask.setVariable("selectResponCount",0); + + nextUserList=object.getJSONArray("dockUserList"); //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); @@ -86,7 +91,10 @@ public class StartSurveyAfter implements TaskListener { busBean.save(busProcessNew); if(nextUserList != null && !nextUserList.isEmpty()){ - for(String nextUser : nextUserList){ + + for (int i = 0; i < nextUserList.size(); i++) { + JSONObject nextUser = nextUserList.getJSONObject(i); + BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -94,7 +102,7 @@ public class StartSurveyAfter implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setUserId(nextUser.getString("id")); busBean.save(busProcessNewNext); } }else{ diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java index c2b39aab..d420c2a5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.StandardSurvey; +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; @@ -31,9 +32,9 @@ public class SummarySurveyAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList; + JSONArray nextUserList; - List responUserList=delegateTask.getVariable("responUserList",List.class); + JSONArray responUserList=delegateTask.getVariable("responUserList",JSONArray.class); for (int i=1;i<10;i++){ delegateTask.setVariable("task"+ i +"Count",0); @@ -41,7 +42,6 @@ public class SummarySurveyAfter implements TaskListener { delegateTask.setVariable("actionFlag",0); - delegateTask.setVariable("responUserList",responUserList); nextUserList=responUserList; @@ -81,7 +81,8 @@ public class SummarySurveyAfter implements TaskListener { busBean.update(busProcessNew,updataWapper); if(nextUserList != null && !nextUserList.isEmpty()){ - for(String nextUser : nextUserList){ + for (int i = 0; i < nextUserList.size(); i++) { + JSONObject nextUser=nextUserList.getJSONObject(i); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -89,7 +90,7 @@ public class SummarySurveyAfter implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setUserId(nextUser.getString("id")); busBean.save(busProcessNewNext); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java index e0d0fa11..b76a17a4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java @@ -88,27 +88,13 @@ public class UploadResearchResultAfter implements TaskListener { 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); - 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("dockUser",String.class)); - busBean.save(busProcessNewNext); - } + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo("责任对接人审批"); + busProcessNewNext.setUserId(delegateTask.getVariable("responUser",JSONObject.class).getString("dockUser")); + busBean.save(busProcessNewNext); } }