diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalAfter.java index 136dea9b..e2133a80 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalAfter.java @@ -10,6 +10,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -35,6 +36,8 @@ public class DockingApprovalAfter implements TaskListener { List nextUserList = new ArrayList(); if ("1".equals(object.getString("actionFlag"))) { delegateTask.setVariable("actionFlag", 1); + JSONObject object1=JSONObject.parseObject(String.valueOf(delegateTask.getVariable("responUser"))); + nextUserList.add(object1.getString("id")); } else { delegateTask.setVariable("actionFlag", 0); } 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 f86c9329..e0b478b2 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 @@ -42,8 +42,8 @@ public class DirectorSignAfter implements TaskListener { //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); + String user = delegateTask.getVariable("startId",String.class); + String username = delegateTask.getVariable("startName",String.class); String standName = object.getString("title"); String prcName = standName+"-标准调研流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); 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 b8ce0bf8..3c46dcbc 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 @@ -41,8 +41,8 @@ public class DockingApprovalAfter implements TaskListener { //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); + String user = delegateTask.getVariable("startId",String.class); + String username = delegateTask.getVariable("startName",String.class); String standName = object.getString("title"); String prcName = standName+"-标准调研流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); 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 e357df86..fa31bca8 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 @@ -44,8 +44,8 @@ public class MinisterAndDockerSignAfter implements TaskListener { //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); + String user = delegateTask.getVariable("startId",String.class); + String username = delegateTask.getVariable("startName",String.class); String standName = object.getString("title"); String prcName = standName+"-标准调研流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); 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 8d6b4ad1..94bf4a45 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 @@ -41,8 +41,8 @@ public class PresidentSignAfter implements TaskListener { //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); + String user = delegateTask.getVariable("startId",String.class); + String username = delegateTask.getVariable("startName",String.class); String standName = object.getString("title"); String prcName = standName+"-标准调研流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); 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 94b87c6b..3fab579f 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 @@ -51,8 +51,8 @@ public class ResponUserSignAfter implements TaskListener { //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); + String user = delegateTask.getVariable("startId",String.class); + String username = delegateTask.getVariable("startName",String.class); String standName = object.getString("title"); String prcName = standName+"-标准调研流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); 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 568aaac8..8e429393 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 @@ -16,10 +16,7 @@ import org.activiti.engine.delegate.TaskListener; import java.rmi.activation.ActivationException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; public class SelectResponsibleUserAfter implements TaskListener { @Override @@ -47,6 +44,8 @@ public class SelectResponsibleUserAfter implements TaskListener { List userListName=Arrays.asList(userListStringName.split(",")); List userList = Arrays.asList(userListString.split(",")); + List strings=new ArrayList<>(); + Map map=new HashMap<>(); for (int i = 0; i < userList.size(); i++) { JSONObject json=new JSONObject(); @@ -54,10 +53,13 @@ public class SelectResponsibleUserAfter implements TaskListener { json.put("name",userListName.get(i)); json.put("dockUser",delegateTask.getAssignee()); responUserList.add(json); + strings.add(userList.get(i)); + map.put(userList.get(i),json); } - //1个Lsit 存id 两个Map key=id dockUser - delegateTask.setVariable("responUserList",responUserList); + delegateTask.setVariable("responUserList",responUserList); + delegateTask.setVariable("responUserLists",strings); + delegateTask.setVariable("datas",map); //截止时间 流程描述 创建人 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 18eb1c05..66f495ed 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 @@ -64,8 +64,10 @@ public class StartSurveyAfter implements TaskListener { //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); + String user = object.getString("startUser"); + String username = object.getString("startUserName"); + delegateTask.setVariable("startId",user); + delegateTask.setVariable("startName",username); String standName = object.getString("title"); String prcName = standName+"-标准调研流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); 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 58a7c44f..6c8a4f90 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 @@ -48,8 +48,8 @@ public class SummarySurveyAfter implements TaskListener { //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); + String user = delegateTask.getVariable("startId",String.class); + String username = delegateTask.getVariable("startName",String.class); String standName = object.getString("title"); String prcName = standName+"-标准调研流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); 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 1ac6da1e..94beeff8 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 @@ -17,10 +17,7 @@ import org.activiti.engine.delegate.TaskListener; import org.activiti.engine.impl.task.TaskDefinition; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; @Slf4j public class UploadResearchResultAfter implements TaskListener { @@ -38,12 +35,13 @@ public class UploadResearchResultAfter implements TaskListener { JSONArray responUserList = delegateTask.getVariable("responUserList", JSONArray.class); - JSONObject responUser = delegateTask.getVariable("responUser", JSONObject.class); - + String responUser = delegateTask.getVariable("responUser",String.class); + Map map=delegateTask.getVariable("datas",Map.class); + JSONObject os=JSONObject.parseObject(String.valueOf(map.get(responUser))); for (int i = 0; i < responUserList.size(); i++) { JSONObject obj=responUserList.getJSONObject(i); - if(obj.getString("id").equals(responUser.getString("id")) - &&obj.getString("dockUser").equals(responUser.getString("dockUser")) + if(obj.getString("id").equals(responUser) + &&obj.getString("dockUser").equals(os.getString("dockUser")) ){ object.put("responUser",obj.getString("id")); @@ -58,7 +56,7 @@ public class UploadResearchResultAfter implements TaskListener { } } - + delegateTask.setVariable("dockUsers",os.getString("dockUser")); delegateTask.setVariable("responUserList",responUserList); @@ -67,8 +65,8 @@ public class UploadResearchResultAfter implements TaskListener { //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); + String user = delegateTask.getVariable("startId",String.class); + String username = delegateTask.getVariable("startName",String.class); String standName = object.getString("title"); String prcName = standName+"-标准调研流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); @@ -105,7 +103,7 @@ public class UploadResearchResultAfter implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo("责任对接人审批"); - busProcessNewNext.setUserId(delegateTask.getVariable("responUser",JSONObject.class).getString("dockUser")); + busProcessNewNext.setUserId(os.getString("dockUser")); busBean.save(busProcessNewNext); } }