add 调研模块

src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java

@@ -144,17 +144,17 @@ public class TodoTaskController extends BaseAction {
             BusProcessName busProcessName = iBusProcessNameService.getOne(queryWrapper);
             String taskIds = "";
             for (Map<String, Object> map : entry.getValue()) {
-                taskIds += map.get("id").toString() + ",";
+                if (busProcessName != null) {
-            }
+                    busProcessName.setTaskIds(map.get("id").toString());
-            if (busProcessName != null) {
+                    busProcessName.setTaskInfo(entry.getValue().get(0).get("name").toString());
-                busProcessName.setTaskIds(taskIds);
+                    busProcessName.setMes(null);
-                busProcessName.setTaskInfo(entry.getValue().get(0).get("name").toString());
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                busProcessName.setMes(null);
+                    String data = sdf.format(entry.getValue().get(0).get("createTime"));
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    busProcessName.setAcceptTime(data);
-                String data = sdf.format(entry.getValue().get(0).get("createTime"));
+                    todoList.add(busProcessName);
-                busProcessName.setAcceptTime(data);
+                }
-                todoList.add(busProcessName);
             }
+
         }
         return todoList;
     }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignAfter.java

@@ -28,30 +28,29 @@ public class DirectorSignAfter implements TaskListener {
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
 
-        JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
+        JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
-        delegateTask.setVariable("objectJson",object);
+        delegateTask.setVariable("objectJson", object);
 
         List<String> nextUserList = new ArrayList();
 
-        if(delegateTask.getVariable("activeFlag",Integer.class)==0){
+        if (delegateTask.getVariable("actionFlag", Integer.class) == 0) {
-            if("1".equals(object.getString("activeFlag"))){
+            if ("1".equals(object.getString("actionFlag"))) {
-                delegateTask.setVariable("activeFlag",1);
+                delegateTask.setVariable("actionFlag", 1);
             }
         }
 
 
-
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = standName+"标准调研流程";
+        String prcName = standName + "标准征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
-        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
-        if(one1!=null){
+        if (one1 != null) {
             one1.setOverTime(OVERTIME);
             one1.setPrcType("1");
             one1.setPrcName(prcName);
@@ -70,10 +69,14 @@ public class DirectorSignAfter implements TaskListener {
         busProcessNew.setCommitText(object.getString("commentText"));
         busProcessNew.setFinishFlag("0");
         busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
 
-        if(nextUserList != null && !nextUserList.isEmpty()){
+        QueryWrapper updataWapper=new QueryWrapper();
-            for(String nextUser : nextUserList){
+        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());
@@ -84,6 +87,26 @@ public class DirectorSignAfter implements TaskListener {
                 busProcessNewNext.setUserId(nextUser);
                 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);
+            }
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignBefore.java

@@ -15,6 +15,7 @@ public class DirectorSignBefore implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java

@@ -45,7 +45,7 @@ public class DockingApprovalAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = standName + "标准调研流程";
+        String prcName = standName + "标准征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -68,7 +68,11 @@ public class DockingApprovalAfter implements TaskListener {
         busProcessNew.setCommitText(object.getString("commentText"));
         busProcessNew.setFinishFlag("0");
         busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
+
+        QueryWrapper updataWapper=new QueryWrapper();
+        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) {
@@ -82,6 +86,36 @@ public class DockingApprovalAfter implements TaskListener {
                 busProcessNewNext.setUserId(nextUser);
                 busBean.save(busProcessNewNext);
             }
+        }else{
+            if(delegateTask.getVariable("actionFlag",Integer.class)==0){
+
+                Integer count=delegateTask.getVariable("task1Count",Integer.class);
+                List<String> responUserList=delegateTask.getVariable("responUserList",List.class);
+                if(count==null)count=0;
+                count++;
+                delegateTask.setVariable("task1Count",count);
+
+                if(count>=responUserList.size()){
+                    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.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo("责任人上传调研结果");
+                busProcessNewNext.setUserId(delegateTask.getVariable("responUser",String.class));
+                busBean.save(busProcessNewNext);
+            }
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalBefore.java

@@ -13,12 +13,18 @@ public class DockingApprovalBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
         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<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java

@@ -32,16 +32,12 @@ public class MinisterAndDockerSignAfter implements TaskListener {
         delegateTask.setVariable("objectJson",object);
 
         List<String> nextUserList = new ArrayList();
-        List<String> userList=delegateTask.getVariable("userList",List.class);
 
-        if(delegateTask.getVariable("activeFlag",Integer.class)==0){
+        if(delegateTask.getVariable("actionFlag",Integer.class)==0){
-            if("1".equals(object.getString("activeFlag"))){
+            if("1".equals(object.getString("actionFlag"))){
-                delegateTask.setVariable("activeFlag",1);
+                delegateTask.setVariable("actionFlag",1);
             }
         }
-        if(delegateTask.getVariable("activeFlag",Integer.class)==1){
-            nextUserList=userList;
-        }
 
 
 
@@ -52,7 +48,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = standName+"标准调研流程";
+        String prcName = standName+"标准征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -65,6 +61,10 @@ public class MinisterAndDockerSignAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+
+
+
+
         // 存储当前节点意见
         BusProcessNew busProcessNew = new BusProcessNew();
         busProcessNew.setMsgType("clause");
@@ -75,21 +75,56 @@ public class MinisterAndDockerSignAfter implements TaskListener {
         busProcessNew.setCommitText(object.getString("commentText"));
         busProcessNew.setFinishFlag("0");
         busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
 
-        if(nextUserList != null && !nextUserList.isEmpty()){
+        QueryWrapper updataWapper=new QueryWrapper();
-            for(String nextUser : nextUserList){
+        updataWapper.eq("TASK_ID",delegateTask.getId());
+        updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
+        busBean.update(busProcessNew,updataWapper);
+
+        Integer count=delegateTask.getVariable("task3OKCount",Integer.class);
+        List<String> userList=delegateTask.getVariable("userList",List.class);
+
+        if(delegateTask.getVariable("actionFlag",Integer.class)==0){
+            if(count==null)count=0;
+            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){
+                        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);
+                }
+            }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.setTaskInfo("标准法规工程师调研汇总");
-                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
                 busBean.save(busProcessNewNext);
             }
         }
+
     }
 }
 

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignBefore.java

@@ -15,10 +15,13 @@ public class MinisterAndDockerSignBefore 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<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java

@@ -45,7 +45,7 @@ public class PresidentSignAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = standName + "标准调研流程";
+        String prcName = standName + "标准征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -68,7 +68,11 @@ public class PresidentSignAfter implements TaskListener {
         busProcessNew.setCommitText(object.getString("commentText"));
         busProcessNew.setFinishFlag("0");
         busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
+
+        QueryWrapper updataWapper=new QueryWrapper();
+        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) {

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignBefore.java

@@ -15,10 +15,12 @@ public class PresidentSignBefore implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java

@@ -35,12 +35,12 @@ public class ResponUserSignAfter implements TaskListener {
         List<String> userList=delegateTask.getVariable("userList",List.class);
         String startUser=delegateTask.getVariable("startUser",String.class);
 
-        if(delegateTask.getVariable("activeFlag",Integer.class)==0){
+        if(delegateTask.getVariable("actionFlag",Integer.class)==0){
-            if("1".equals(object.getString("activeFlag"))){
+            if("1".equals(object.getString("actionFlag"))){
-                delegateTask.setVariable("activeFlag",1);
+                delegateTask.setVariable("actionFlag",1);
             }
         }
-        if(delegateTask.getVariable("activeFlag",Integer.class)==0){
+        if(delegateTask.getVariable("actionFlag",Integer.class)==0){
             nextUserList=userList;
         }
 
@@ -53,7 +53,7 @@ public class ResponUserSignAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = standName+"标准调研流程";
+        String prcName = standName+"标准征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -76,18 +76,47 @@ public class ResponUserSignAfter implements TaskListener {
         busProcessNew.setCommitText(object.getString("commentText"));
         busProcessNew.setFinishFlag("0");
         busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
 
-        if(nextUserList != null && !nextUserList.isEmpty()){
+        QueryWrapper updataWapper=new QueryWrapper();
-            for(String nextUser : nextUserList){
+        updataWapper.eq("TASK_ID",delegateTask.getId());
+        updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
+        busBean.update(busProcessNew,updataWapper);
+
+        Integer count=delegateTask.getVariable("task2OKCount",Integer.class);
+        List<String> responUserList=delegateTask.getVariable("responUserList",List.class);
+
+
+        if(count==null)count=0;
+
+        if(delegateTask.getVariable("actionFlag",Integer.class)==0){
+
+
+            count++;
+            delegateTask.setVariable("task2OKCount",count);
+        }
+        if(count>=responUserList.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.setTaskInfo("标准法规工程师调研汇总");
-                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
                 busBean.save(busProcessNewNext);
             }
         }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignBefore.java

@@ -15,10 +15,12 @@ public class ResponUserSignBefore implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java

@@ -1,5 +1,6 @@
 package com.ydw.bat.wkflow.listener.StandardCommentProcess;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
@@ -13,10 +14,7 @@ import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
 
 public class SelectResponsibleUserAfter implements TaskListener {
     @Override
@@ -32,17 +30,50 @@ public class SelectResponsibleUserAfter implements TaskListener {
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
-        List<String> nextUserList = new ArrayList();
+        List<String> responUserList1 = delegateTask.getVariable("responUserList", List.class);
-        String userListString=object.getString("responUserList");
+        if(responUserList1==null)responUserList1=new ArrayList<>();
+        List<String> responUserListName1 = delegateTask.getVariable("responUserListName", List.class);
+        if(responUserListName1==null)responUserListName1=new ArrayList<>();
 
-        List<String> userList = Arrays.asList(userListString.split(","));
+        List<String> dockUserList=delegateTask.getVariable("dockUserList",List.class);
-        for (int i = 0; i < userList.size(); i++) {
+
-            nextUserList.add(userList.get(i).trim());
+        List<String> nextUserList;
+
+        String userListString=object.getString("responUserList");
+        String userListStringName=object.getString("responUserListName");
+
+        List<String> responUserList = Arrays.asList(userListString.split(","));
+        for (int i = 0; i < responUserList.size(); i++) {
+            responUserList1.add(responUserList.get(i).trim());
+            delegateTask.setVariable(responUserList.get(i).trim()+"dockUser",delegateTask.getAssignee());
         }
 
-        delegateTask.setVariable("responUserList",nextUserList);
+        List<String> responUserListName= Arrays.asList(userListStringName.split(","));
+        for (String name : responUserListName) {
+            responUserListName1.add(name.trim());
+        }
+        nextUserList=responUserList1;
 
+        JSONObject userListJson= JSON.parseObject(delegateTask.getVariable("responUserListMap",String.class));
+        if(userListJson==null)userListJson=new JSONObject();
+        for (int i = 0; i < responUserList.size()&&i<responUserListName.size(); i++) {
+            JSONObject json=new JSONObject();
+            json.put("id",responUserList.get(i));
+            json.put("name",responUserListName.get(i));
+            json.put("dockUser",delegateTask.getAssignee());
 
+            userListJson.put(responUserList.get(i),json);
+        }
+
+        delegateTask.setVariable("responUserListMap",userListJson.toJSONString());
+        delegateTask.setVariable("responUserList",responUserList1);
+        delegateTask.setVariable("responUserListName1",responUserListName1);
+        delegateTask.setVariable("responUserCompletedCount",0);
+
+        Integer selectResponCompletedCount=delegateTask.getVariable("selectResponCompletedCount",Integer.class);
+        if(selectResponCompletedCount==null)selectResponCompletedCount=0;
+        selectResponCompletedCount++;
+        delegateTask.setVariable("selectResponCompletedCount",selectResponCompletedCount);
 
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
@@ -50,7 +81,7 @@ public class SelectResponsibleUserAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = standName+"标准调研流程";
+        String prcName = standName+"标准征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -73,19 +104,36 @@ public class SelectResponsibleUserAfter implements TaskListener {
         busProcessNew.setCommitText(object.getString("commentText"));
         busProcessNew.setFinishFlag("0");
         busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
 
-        if(nextUserList != null && !nextUserList.isEmpty()){
+        QueryWrapper updataWapper=new QueryWrapper();
-            for(String nextUser : nextUserList){
+        updataWapper.eq("TASK_ID",delegateTask.getId());
-                BusProcessNew busProcessNewNext = new BusProcessNew();
+        updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
-                busProcessNewNext.setMsgType("clause");
+        busBean.update(busProcessNew,updataWapper);
-                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+
-                busProcessNewNext.setMesg(object.toJSONString());
+
-                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+
-                busProcessNewNext.setFinishFlag("0");
+        if(selectResponCompletedCount>=dockUserList.size()){
-                busProcessNewNext.setTaskInfo(delegateTask.getName());
+
-                busProcessNewNext.setUserId(nextUser);
+            Collection<Object> values = userListJson.getInnerMap().values();
-                busBean.save(busProcessNewNext);
+            Collection<Map<String,Object>> respon=new ArrayList<>();
+            for (Object value : values) {
+                respon.add(((JSONObject)value).getInnerMap());
+            }
+            delegateTask.setVariable("zqazqazqaUserList",respon);
+
+
+            if(nextUserList != null && !nextUserList.isEmpty()){
+                for(Map<String,Object> zqa : respon){
+                    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((String) zqa.get("id"));
+                    busBean.save(busProcessNewNext);
+                }
             }
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserBefore.java

@@ -15,10 +15,13 @@ public class SelectResponsibleUserBefore 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<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java

@@ -33,18 +33,27 @@ public class StartSurveyAfter implements TaskListener {
 
         List<String> nextUserList = new ArrayList();
         List<String> userList=new ArrayList<>();
-
+        List<String> dockUserList=new ArrayList<>();
+        for (String dockUser : object.getString("dockUserList").split(",")) {
+            dockUserList.add(dockUser.trim());
+        }
+        nextUserList=dockUserList;
         delegateTask.setVariable("startUser",object.getString("startUser"));
-        delegateTask.setVariable("dockUser",object.getString("dockUser"));
+
+        delegateTask.setVariable("dockUserList",dockUserList);
+
         delegateTask.setVariable("ministerUser",object.getString("ministerUser"));
         delegateTask.setVariable("directorUser",object.getString("directorUser"));
         delegateTask.setVariable("presidentUser",object.getString("presidentUser"));
 
-        userList.add(object.getString("dockUser"));
         userList.add(object.getString("ministerUser"));
+        userList.addAll(dockUserList);
 
         delegateTask.setVariable("userList",userList);
-        delegateTask.setVariable("activeFlag",0);
+        delegateTask.setVariable("actionFlag",0);
+
+        delegateTask.setVariable("selectResponCompletedCount",0);
+
 
 
         //截止时间 流程描述 创建人
@@ -53,7 +62,7 @@ public class StartSurveyAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = standName+"标准调研流程";
+        String prcName = standName+"标准征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -66,16 +75,20 @@ public class StartSurveyAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+
+
         // 存储当前节点意见
         BusProcessNew busProcessNew = new BusProcessNew();
         busProcessNew.setMsgType("clause");
         busProcessNew.setPId(delegateTask.getProcessInstanceId());
         busProcessNew.setMesg(object.toJSONString());
         busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setUserId(delegateTask.getAssignee());
         busProcessNew.setTaskId(delegateTask.getId());
         busProcessNew.setCommitText(object.getString("commentText"));
         busProcessNew.setFinishFlag("0");
         busProcessNew.setTaskInfo(delegateTask.getName());
+
         busBean.save(busProcessNew);
 
         if(nextUserList != null && !nextUserList.isEmpty()){
@@ -90,6 +103,15 @@ public class StartSurveyAfter implements TaskListener {
                 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);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyBefore.java

@@ -15,10 +15,12 @@ public class StartSurveyBefore implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyAfter.java

@@ -34,7 +34,12 @@ public class SummarySurveyAfter implements TaskListener {
 
         List<String> responUserList=delegateTask.getVariable("responUserList",List.class);
 
-        delegateTask.setVariable("activeFlag",0);
+        for (int i=1;i<10;i++){
+            delegateTask.setVariable("task"+ i +"Count",0);
+        }
+
+
+        delegateTask.setVariable("actionFlag",0);
         delegateTask.setVariable("responUserList",responUserList);
         nextUserList=responUserList;
 
@@ -45,7 +50,7 @@ public class SummarySurveyAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = standName+"标准调研流程";
+        String prcName = standName+"标准征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -68,7 +73,11 @@ public class SummarySurveyAfter implements TaskListener {
         busProcessNew.setCommitText(object.getString("commentText"));
         busProcessNew.setFinishFlag("0");
         busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
+
+        QueryWrapper updataWapper=new QueryWrapper();
+        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){

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyBefore.java

@@ -1,5 +1,7 @@
 package com.ydw.bat.wkflow.listener.StandardCommentProcess;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
@@ -15,10 +17,16 @@ public class SummarySurveyBefore implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            JSONObject obj= JSON.parseObject(one1.getMesg());
+            JSONObject map = JSON.parseObject(delegateTask.getVariable("responUserListMap", String.class));
+            obj.put("responUserListMap",map.values());
+            one1.setMesg(obj.toJSONString());
             one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java

@@ -1,5 +1,6 @@
 package com.ydw.bat.wkflow.listener.StandardCommentProcess;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
@@ -31,11 +32,21 @@ public class UploadResearchResultAfter  implements TaskListener {
         Datas datas = datasService.getOne(queryWrapper);
 
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
-        delegateTask.setVariable("objectJson",object);
+
+
+        JSONObject map = JSON.parseObject(delegateTask.getVariable("responUserListMap", String.class));
+        JSONObject jsonObject = map.getJSONObject(delegateTask.getAssignee());
+
+        jsonObject.put("info",object.get("info"));
+
+        map.put(delegateTask.getAssignee(),jsonObject);
+        delegateTask.setVariable("responUserListMap",map.toJSONString());
 
         List<String> nextUserList = new ArrayList();
+        object.put("responUser",jsonObject.getString("id"));
+        object.put("responUserName",jsonObject.getString("name"));
 
-
+        delegateTask.setVariable("objectJson",object);
 
 
         //截止时间 流程描述 创建人
@@ -44,7 +55,7 @@ public class UploadResearchResultAfter  implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = standName+"标准调研流程";
+        String prcName = standName+"标准征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -67,7 +78,11 @@ public class UploadResearchResultAfter  implements TaskListener {
         busProcessNew.setCommitText(object.getString("commentText"));
         busProcessNew.setFinishFlag("0");
         busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
+
+        QueryWrapper updataWapper=new QueryWrapper();
+        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){
@@ -81,6 +96,15 @@ public class UploadResearchResultAfter  implements TaskListener {
                 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(delegateTask.getAssignee()+"dockUser",String.class));
+            busBean.save(busProcessNewNext);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultBefore.java

@@ -15,10 +15,13 @@ public class UploadResearchResultBefore  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<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java

@@ -33,9 +33,9 @@ public class DirectorSignAfter implements TaskListener {
 
         List<String> nextUserList = new ArrayList();
 
-        if (delegateTask.getVariable("activeFlag", Integer.class) == 0) {
+        if (delegateTask.getVariable("actionFlag", Integer.class) == 0) {
-            if ("1".equals(object.getString("activeFlag"))) {
+            if ("1".equals(object.getString("actionFlag"))) {
-                delegateTask.setVariable("activeFlag", 1);
+                delegateTask.setVariable("actionFlag", 1);
             }
         }
 
@@ -88,7 +88,7 @@ public class DirectorSignAfter implements TaskListener {
                 busBean.save(busProcessNewNext);
             }
         } else {
-            if (delegateTask.getVariable("activeFlag", Integer.class) == 0) {
+            if (delegateTask.getVariable("actionFlag", Integer.class) == 0) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignBefore.java

@@ -20,7 +20,6 @@ public class DirectorSignBefore implements TaskListener {
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
-            one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java

@@ -30,7 +30,7 @@ public class DockingApprovalAfter implements TaskListener {
         JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson", object);
 
-        List<String> nextUserList = new ArrayList();
+        List<String> nextUserList = null;
         if ("1".equals(object.getString("actionFlag"))) {
             delegateTask.setVariable("actionFlag", 1);
         } else {
@@ -73,48 +73,35 @@ public class DockingApprovalAfter implements TaskListener {
         updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
         busBean.update(busProcessNew,updataWapper);
 
-        if (nextUserList != null && !nextUserList.isEmpty()) {
+        if(delegateTask.getVariable("actionFlag",Integer.class)==0){
-            for (String nextUser : nextUserList) {
+
+            Integer responUserCompletedCount=delegateTask.getVariable("responUserCompletedCount",Integer.class);
+            if(responUserCompletedCount==null)responUserCompletedCount=0;
+            responUserCompletedCount++;
+            delegateTask.setVariable("selectResponCompletedCount",responUserCompletedCount);
+
+            Collection responUserList=delegateTask.getVariable("zqazqazqaUserList",Collection.class);
+
+            if(responUserCompletedCount>=responUserList.size()){
                 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.setTaskInfo("标准法规工程师调研汇总");
-                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setUserId(delegateTask.getVariable("startUser",String.class));
                 busBean.save(busProcessNewNext);
             }
+
         }else{
-            if(delegateTask.getVariable("activeFlag",Integer.class)==0){
+            BusProcessNew busProcessNewNext = new BusProcessNew();
-
+            busProcessNewNext.setMsgType("clause");
-                Integer count=delegateTask.getVariable("task1Count",Integer.class);
+            busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                List<String> responUserList=delegateTask.getVariable("responUserList",List.class);
+            busProcessNewNext.setMesg(object.toJSONString());
-                if(count==null)count=0;
+            busProcessNewNext.setFinishFlag("0");
-                count++;
+            busProcessNewNext.setTaskInfo("责任人上传调研结果");
-                delegateTask.setVariable("task1Count",count);
+            busProcessNewNext.setUserId(delegateTask.getVariable("responUser",String.class));
-
+            busBean.save(busProcessNewNext);
-                if(count>=responUserList.size()){
-                    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.setFinishFlag("0");
-                busProcessNewNext.setTaskInfo("责任人上传调研结果");
-                busProcessNewNext.setUserId(delegateTask.getVariable("responUser",String.class));
-                busBean.save(busProcessNewNext);
-            }
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java

@@ -33,9 +33,9 @@ public class MinisterAndDockerSignAfter implements TaskListener {
 
         List<String> nextUserList = new ArrayList();
 
-        if(delegateTask.getVariable("activeFlag",Integer.class)==0){
+        if(delegateTask.getVariable("actionFlag",Integer.class)==0){
-            if("1".equals(object.getString("activeFlag"))){
+            if("1".equals(object.getString("actionFlag"))){
-                delegateTask.setVariable("activeFlag",1);
+                delegateTask.setVariable("actionFlag",1);
             }
         }
 
@@ -84,13 +84,13 @@ public class MinisterAndDockerSignAfter implements TaskListener {
         Integer count=delegateTask.getVariable("task3OKCount",Integer.class);
         List<String> userList=delegateTask.getVariable("userList",List.class);
 
-        if(delegateTask.getVariable("activeFlag",Integer.class)==0){
+        if(delegateTask.getVariable("actionFlag",Integer.class)==0){
             if(count==null)count=0;
             count++;
             delegateTask.setVariable("task3OKCount",count);
         }
         if(count>=userList.size()){
-            if(delegateTask.getVariable("activeFlag",Integer.class)==0){
+            if(delegateTask.getVariable("actionFlag",Integer.class)==0){
                 if(nextUserList != null && !nextUserList.isEmpty()){
                     for(String nextUser : nextUserList){
                         BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java

@@ -36,12 +36,12 @@ public class ResponUserSignAfter implements TaskListener {
         List<String> userList=delegateTask.getVariable("userList",List.class);
         String startUser=delegateTask.getVariable("startUser",String.class);
 
-        if(delegateTask.getVariable("activeFlag",Integer.class)==0){
+        if(delegateTask.getVariable("actionFlag",Integer.class)==0){
-            if("1".equals(object.getString("activeFlag"))){
+            if("1".equals(object.getString("actionFlag"))){
-                delegateTask.setVariable("activeFlag",1);
+                delegateTask.setVariable("actionFlag",1);
             }
         }
-        if(delegateTask.getVariable("activeFlag",Integer.class)==0){
+        if(delegateTask.getVariable("actionFlag",Integer.class)==0){
             nextUserList=userList;
         }
 
@@ -86,14 +86,17 @@ public class ResponUserSignAfter implements TaskListener {
         Integer count=delegateTask.getVariable("task2OKCount",Integer.class);
         List<String> responUserList=delegateTask.getVariable("responUserList",List.class);
 
-        if(delegateTask.getVariable("activeFlag",Integer.class)==0){
 
-            if(count==null)count=0;
+        if(count==null)count=0;
+
+        if(delegateTask.getVariable("actionFlag",Integer.class)==0){
+
+
             count++;
             delegateTask.setVariable("task2OKCount",count);
         }
         if(count>=responUserList.size()){
-            if(delegateTask.getVariable("activeFlag",Integer.class)==0){
+            if(delegateTask.getVariable("actionFlag",Integer.class)==0){
                 if(nextUserList != null && !nextUserList.isEmpty()){
                     for(String nextUser : nextUserList){
                         BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java

@@ -47,7 +47,7 @@ public class StartSurveyAfter implements TaskListener {
         userList.add(object.getString("ministerUser"));
 
         delegateTask.setVariable("userList",userList);
-        delegateTask.setVariable("activeFlag",0);
+        delegateTask.setVariable("actionFlag",0);
 
 
         //截止时间 流程描述 创建人

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java

@@ -40,7 +40,7 @@ public class SummarySurveyAfter implements TaskListener {
         }
 
 
-        delegateTask.setVariable("activeFlag",0);
+        delegateTask.setVariable("actionFlag",0);
         delegateTask.setVariable("responUserList",responUserList);
         nextUserList=responUserList;
 

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java

@@ -44,8 +44,11 @@ public class UploadResearchResultAfter  implements TaskListener {
         delegateTask.setVariable("responUserListMap",map.toJSONString());
 
         List<String> nextUserList = new ArrayList();
-        object.put("responUser",object.getString("id"));
+
-        object.put("responUserName",object.getString("name"));
+
+
+        object.put("responUser",jsonObject.getString("id"));
+        object.put("responUserName",jsonObject.getString("name"));
 
         delegateTask.setVariable("objectJson",object);