Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java

@@ -167,7 +167,7 @@ public interface LawsUserInfoService {
     @PostMapping("/sarStandUnqualified/sar-stand-unqualified/updateBatch")
     public ResponseMessage<Object> updateBatch(@RequestBody List<SarStandUnqualified> sarStandUnqualified);
 
-    @PostMapping("/wg_work_group/updateData")
+    @PostMapping("/wg_work_group/updateDataByWk")
     public ResponseMessage<Object> wg_work_group_update(@RequestBody WgWorkGroupShowDTO wgWorkGroupShowDTO);
 
 

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10Before.java

@@ -17,6 +17,7 @@ public class Step10Before implements TaskListener {
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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()){

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step1Before.java

@@ -17,6 +17,7 @@ public class Step1Before implements TaskListener {
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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()){

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step2Before.java

@@ -17,6 +17,7 @@ public class Step2Before implements TaskListener {
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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()){

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3After.java

@@ -75,6 +75,7 @@ public class Step3After implements TaskListener {
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){
                 BusProcessNew busProcessNewNext = new BusProcessNew();
+                object.put("SKS",delegateTask.getAssignee());
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
                 busProcessNewNext.setMesg(object.toJSONString());

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3Before.java

@@ -17,6 +17,7 @@ public class Step3Before implements TaskListener {
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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()){

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4After.java

@@ -45,7 +45,8 @@ public class Step4After implements TaskListener {
             prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师分线审核";
             delegateTask.setVariable("spFlag","0");
         }else {
-            nextUserList.add(delegateTask.getVariable("zrUserId1",String.class));
+            delegateTask.setVariable("zrUserId1",object.getString("SKS"));
+            nextUserList.add(object.getString("SKS"));
             prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-责任部门对接人汇总并选择审批人";
             delegateTask.setVariable("spFlag","1");
         }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4Before.java

@@ -17,6 +17,7 @@ public class Step4Before implements TaskListener {
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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()){

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5After.java

@@ -69,7 +69,8 @@ public class Step5After implements TaskListener {
             delegateTask.setVariable("bzFlag","0");
             prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师汇总";
         }else {
-            nextUserList.add(delegateTask.getVariable("zrUserId1",String.class));
+            delegateTask.setVariable("zrUserId1",object.getString("SKS"));
+            nextUserList.add(object.getString("SKS"));
             prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-责任部门对接人汇总并选择审批人";
             delegateTask.setVariable("bzFlag","1");
         }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5Before.java

@@ -17,6 +17,7 @@ public class Step5Before implements TaskListener {
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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()){

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step6Before.java

@@ -17,6 +17,7 @@ public class Step6Before implements TaskListener {
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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()){

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step7Before.java

@@ -17,6 +17,7 @@ public class Step7Before implements TaskListener {
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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()){

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8Before.java

@@ -17,6 +17,7 @@ public class Step8Before implements TaskListener {
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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()){

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step9Before.java

@@ -17,6 +17,7 @@ public class Step9Before implements TaskListener {
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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()){

src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
+import com.ydw.bat.wkflow.business_main.datas.dto.WG.WgWorkGroupShowDTO;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
@@ -29,6 +30,9 @@ public class WriteMaterialAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        LawsUserInfoService infoService=SpringContextUtil.getBean(LawsUserInfoService.class);
+
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -82,6 +86,30 @@ public class WriteMaterialAfter implements TaskListener {
             busBean.save(busProcessNews);
         }
 
+
+        JSONObject object1 = object.getJSONObject("rh_pageData");
+        WgWorkGroupShowDTO wgWorkGroupShowDTO = new WgWorkGroupShowDTO();
+        if (StringUtils.isNotEmpty(object1.getString("comityName"))) {
+            wgWorkGroupShowDTO.setId(object1.getString("comityName"));
+            wgWorkGroupShowDTO.setLevel("1");
+            wgWorkGroupShowDTO.setNature("1");
+            if (StringUtils.isNotEmpty(object1.getString("comityNameOne"))) {
+                wgWorkGroupShowDTO.setId(object1.getString("comityNameOne"));
+                wgWorkGroupShowDTO.setLevel("2");
+                wgWorkGroupShowDTO.setNature("2");
+                if (StringUtils.isNotEmpty(object1.getString("comityNameTwo"))) {
+                    wgWorkGroupShowDTO.setId(object1.getString("comityNameTwo"));
+                    wgWorkGroupShowDTO.setLevel("3");
+                    wgWorkGroupShowDTO.setNature("3");
+                }
+            }
+        }
+        wgWorkGroupShowDTO.setTypes("0");
+        wgWorkGroupShowDTO.setStatus("0");
+        infoService.wg_work_group_update(wgWorkGroupShowDTO);
+
+
+
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

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

@@ -70,21 +70,19 @@ public class DirectorSignAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        //存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
+        if (null != object.getString("commentText")) {
-        busProcessNew.setMsgType("clause");
+            QueryWrapper queryWrapper3 = new QueryWrapper();
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
-        busProcessNew.setMesg(object.toJSONString());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
-        busProcessNew.setTaskId(delegateTask.getId());
+            if (!list.isEmpty()) {
-        busProcessNew.setCommitText(object.getString("commentText"));
+                BusProcessNew busProcessNews = list.get(0);
-        busProcessNew.setFinishFlag("0");
+                busProcessNews.setTaskId(delegateTask.getId());
-        busProcessNew.setTaskInfo(delegateTask.getName());
+                busProcessNews.setCommitText(object.getString("commentText"));
-
+                busBean.saveOrUpdate(busProcessNews);
-        QueryWrapper updataWapper=new QueryWrapper();
+            }
-        updataWapper.eq("TASK_ID",delegateTask.getId());
+        }
-        updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
-        busBean.update(busProcessNew,updataWapper);
         if (delegateTask.getVariable("countSign",Integer.class)>=delegateTask.getVariable("directorUserList",List.class).size()) {
             if ("true".equals(delegateTask.getVariable("7Mark", String.class))) {
                 delegateTask.setVariable("actionFlag", 0);

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

@@ -18,6 +18,7 @@ public class DirectorSignBefore implements TaskListener {
 
         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()){

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

@@ -56,21 +56,19 @@ public class DockingApprovalAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        //存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
+        if (null != object.getString("commentText")) {
-        busProcessNew.setMsgType("clause");
+            QueryWrapper queryWrapper3 = new QueryWrapper();
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
-        busProcessNew.setMesg(object.toJSONString());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
-        busProcessNew.setTaskId(delegateTask.getId());
+            if (!list.isEmpty()) {
-        busProcessNew.setCommitText(object.getString("commentText"));
+                BusProcessNew busProcessNews = list.get(0);
-        busProcessNew.setFinishFlag("0");
+                busProcessNews.setTaskId(delegateTask.getId());
-        busProcessNew.setTaskInfo(delegateTask.getName());
+                busProcessNews.setCommitText(object.getString("commentText"));
-
+                busBean.saveOrUpdate(busProcessNews);
-        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/StandardSurvey/MinisterAndDockerSignAfter.java

@@ -66,21 +66,19 @@ public class MinisterAndDockerSignAfter implements TaskListener {
 
 
 
-        // 存储当前节点意见
+        //存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
+        if (null != object.getString("commentText")) {
-        busProcessNew.setMsgType("clause");
+            QueryWrapper queryWrapper3 = new QueryWrapper();
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
-        busProcessNew.setMesg(object.toJSONString());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
-        busProcessNew.setTaskId(delegateTask.getId());
+            if (!list.isEmpty()) {
-        busProcessNew.setCommitText(object.getString("commentText"));
+                BusProcessNew busProcessNews = list.get(0);
-        busProcessNew.setFinishFlag("0");
+                busProcessNews.setTaskId(delegateTask.getId());
-        busProcessNew.setTaskInfo(delegateTask.getName());
+                busProcessNews.setCommitText(object.getString("commentText"));
-
+                busBean.saveOrUpdate(busProcessNews);
-        QueryWrapper updataWapper=new QueryWrapper();
+            }
-        updataWapper.eq("TASK_ID",delegateTask.getId());
+        }
-        updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
-        busBean.update(busProcessNew,updataWapper);
         Integer count = 0;
         if (null!=delegateTask.getVariable("task3OKCount",Integer.class)) {
             count = delegateTask.getVariable("task3OKCount", Integer.class);

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

@@ -58,21 +58,19 @@ public class PresidentSignAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        //存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
+        if (null != object.getString("commentText")) {
-        busProcessNew.setMsgType("clause");
+            QueryWrapper queryWrapper3 = new QueryWrapper();
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
-        busProcessNew.setMesg(object.toJSONString());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
-        busProcessNew.setTaskId(delegateTask.getId());
+            if (!list.isEmpty()) {
-        busProcessNew.setCommitText(object.getString("commentText"));
+                BusProcessNew busProcessNews = list.get(0);
-        busProcessNew.setFinishFlag("0");
+                busProcessNews.setTaskId(delegateTask.getId());
-        busProcessNew.setTaskInfo(delegateTask.getName());
+                busProcessNews.setCommitText(object.getString("commentText"));
-
+                busBean.saveOrUpdate(busProcessNews);
-        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/StandardSurvey/PresidentSignBefore.java

@@ -18,6 +18,7 @@ public class PresidentSignBefore implements TaskListener {
 
         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()){

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

@@ -30,36 +30,34 @@ public class ResponUserSignAfter 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();
-        List<String> userList=delegateTask.getVariable("userList",List.class);
+        List<String> userList = delegateTask.getVariable("userList", List.class);
-        String startUser=delegateTask.getVariable("startUser",String.class);
+        String startUser = delegateTask.getVariable("startUser", String.class);
 
-        if(delegateTask.getVariable("actionFlag",Integer.class)==0){
+        if (delegateTask.getVariable("actionFlag", Integer.class) == 0) {
-            if("1".equals(object.getString("actionFlag"))){
+            if ("1".equals(object.getString("actionFlag"))) {
-                delegateTask.setVariable("actionFlag",1);
+                delegateTask.setVariable("actionFlag", 1);
-                nextUserList.add(delegateTask.getVariable("startUser",String.class));
+                nextUserList.add(delegateTask.getVariable("startUser", String.class));
             }
         }
-        if(delegateTask.getVariable("actionFlag",Integer.class)==0){
+        if (delegateTask.getVariable("actionFlag", Integer.class) == 0) {
-            nextUserList=userList;
+            nextUserList = userList;
         }
 
 
-
-
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
-        String user = delegateTask.getVariable("startId",String.class);
+        String user = delegateTask.getVariable("startId", String.class);
-        String username = delegateTask.getVariable("startName",String.class);
+        String username = delegateTask.getVariable("startName", String.class);
-        String standName = delegateTask.getVariable("title",String.class);
+        String standName = delegateTask.getVariable("title", String.class);
-        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("2");
             one1.setPrcName(prcName);
@@ -68,58 +66,67 @@ public class ResponUserSignAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        //存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
+        if (null != object.getString("commentText")) {
-        busProcessNew.setMsgType("clause");
+            QueryWrapper queryWrapper3 = new QueryWrapper();
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
-        busProcessNew.setMesg(object.toJSONString());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
-        busProcessNew.setTaskId(delegateTask.getId());
+            if (!list.isEmpty()) {
-        busProcessNew.setCommitText(object.getString("commentText"));
+                BusProcessNew busProcessNews = list.get(0);
-        busProcessNew.setFinishFlag("0");
+                busProcessNews.setTaskId(delegateTask.getId());
-        busProcessNew.setTaskInfo(delegateTask.getName());
+                busProcessNews.setCommitText(object.getString("commentText"));
-
+                busBean.saveOrUpdate(busProcessNews);
-        QueryWrapper updataWapper=new QueryWrapper();
+            }
-        updataWapper.eq("TASK_ID",delegateTask.getId());
+        }
-        updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
-        busBean.update(busProcessNew,updataWapper);
-
-        Integer count=delegateTask.getVariable("task2OKCount",Integer.class);
-        JSONArray responUserList=delegateTask.getVariable("responUserList", JSONArray.class);
 
 
-        if(count==null)count=1;
+        if (null!=delegateTask.getVariable("cs")){
+            delegateTask.setVariable("cs",delegateTask.getVariable("cs",Integer.class)+1);
+        }else {
+            delegateTask.setVariable("cs",1);
+        }
 
-        if(delegateTask.getVariable("actionFlag",Integer.class)==0){
+        Integer count = delegateTask.getVariable("task2OKCount", Integer.class);
+        JSONArray responUserList = delegateTask.getVariable("responUserList", JSONArray.class);
+
+
+        if (count == null) count = 1;
+
+        if (delegateTask.getVariable("actionFlag", Integer.class) == 0) {
 
 
             count++;
-            delegateTask.setVariable("task2OKCount",count);
+            delegateTask.setVariable("task2OKCount", count);
         }
-        if(count>=responUserList.size()){
+        if (delegateTask.getVariable("cs",Integer.class)>= delegateTask.getVariable("responUserLists",List.class).size()) {
-            if(delegateTask.getVariable("actionFlag",Integer.class)==0){
+            if (count >= responUserList.size()) {
-                if(nextUserList != null && !nextUserList.isEmpty()){
+                if (delegateTask.getVariable("actionFlag", Integer.class) == 0) {
-                    List<String> res=new ArrayList<>();
+                    if (nextUserList != null && !nextUserList.isEmpty()) {
-                    nextUserList.forEach(s -> {
+                        List<String> res = new ArrayList<>();
-                        if (!res.contains(s)){
+                        nextUserList.forEach(s -> {
-                            res.add(s);
+                            if (!res.contains(s)) {
+                                res.add(s);
+                            }
+                        });
+                        delegateTask.setVariable("userList", res);
+                        for (String nextUser : res) {
+                            BusProcessNew busProcessNewNext = new BusProcessNew();
+                            busProcessNewNext.setMsgType("clause");
+                            busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                            busProcessNewNext.setMesg(object.toJSONString());
+                            busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                            busProcessNewNext.setFinishFlag("0");
+                            busProcessNewNext.setTaskInfo(delegateTask.getName());
+                            busProcessNewNext.setUserId(nextUser);
+                            busProcessNewNext.setPrcName(prcName);
+                            busBean.save(busProcessNewNext);
                         }
-                    });
-                    delegateTask.setVariable("userList",res);
-                    for(String nextUser : res){
-                        BusProcessNew busProcessNewNext = new BusProcessNew();
-                        busProcessNewNext.setMsgType("clause");
-                        busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                        busProcessNewNext.setMesg(object.toJSONString());
-                        busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
-                        busProcessNewNext.setFinishFlag("0");
-                        busProcessNewNext.setTaskInfo(delegateTask.getName());
-                        busProcessNewNext.setUserId(nextUser);
-                        busProcessNewNext.setPrcName(prcName);
-                        busBean.save(busProcessNewNext);
                     }
                 }
-            }else {
+            } else {
+                delegateTask.setVariable("actionFlag",1);
+                delegateTask.setVariable("cs",0);
                 BusProcessNew busProcessNewNext = new BusProcessNew();
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -131,6 +138,7 @@ public class ResponUserSignAfter implements TaskListener {
                 busBean.save(busProcessNewNext);
             }
         }
+
     }
 }
 

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

@@ -18,6 +18,7 @@ public class ResponUserSignBefore implements TaskListener {
 
         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()){

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

@@ -90,21 +90,19 @@ public class SelectResponsibleUserAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        //存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
+        if (null != object.getString("commentText")) {
-        busProcessNew.setMsgType("clause");
+            QueryWrapper queryWrapper3 = new QueryWrapper();
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
-        busProcessNew.setMesg(object.toJSONString());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
-        busProcessNew.setTaskId(delegateTask.getId());
+            if (!list.isEmpty()) {
-        busProcessNew.setCommitText(object.getString("commentText"));
+                BusProcessNew busProcessNews = list.get(0);
-        busProcessNew.setFinishFlag("0");
+                busProcessNews.setTaskId(delegateTask.getId());
-        busProcessNew.setTaskInfo(delegateTask.getName());
+                busProcessNews.setCommitText(object.getString("commentText"));
-
+                busBean.saveOrUpdate(busProcessNews);
-        QueryWrapper updataWapper=new QueryWrapper();
+            }
-        updataWapper.eq("TASK_ID",delegateTask.getId());
+        }
-        updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
-        busBean.update(busProcessNew,updataWapper);
 
         Integer count=delegateTask.getVariable("selectResponCount",Integer.class);
         if(count==null)count=0;

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

@@ -64,21 +64,19 @@ public class SummarySurveyAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        //存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
+        if (null != object.getString("commentText")) {
-        busProcessNew.setMsgType("clause");
+            QueryWrapper queryWrapper3 = new QueryWrapper();
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
-        busProcessNew.setMesg(object.toJSONString());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
-        busProcessNew.setTaskId(delegateTask.getId());
+            if (!list.isEmpty()) {
-        busProcessNew.setCommitText(object.getString("commentText"));
+                BusProcessNew busProcessNews = list.get(0);
-        busProcessNew.setFinishFlag("0");
+                busProcessNews.setTaskId(delegateTask.getId());
-        busProcessNew.setTaskInfo(delegateTask.getName());
+                busProcessNews.setCommitText(object.getString("commentText"));
-
+                busBean.saveOrUpdate(busProcessNews);
-        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(Object nextUser1 : nextUserList){

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

@@ -21,6 +21,7 @@ public class SummarySurveyBefore implements TaskListener {
 
         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()){

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java

@@ -72,7 +72,6 @@ public class PEPffresPersonAfter implements TaskListener {
                 busProcessNewNext.setMesg(object.toJSONString());
                 busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                 busProcessNewNext.setFinishFlag("0");
-                busProcessNewNext.setCommitText(object.getString("commentText"));
                 busProcessNewNext.setTaskInfo(delegateTask.getName());
                 busProcessNewNext.setUserId(String.valueOf(delegateTask.getVariable("workPeople")));
                 busProcessNewNext.setPrcName(prcName);

src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java

@@ -2,6 +2,8 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
+import com.ydw.bat.wkflow.business_main.datas.dto.WG.WgWorkGroupShowDTO;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
@@ -29,6 +31,7 @@ public class WriteMaterialAfter implements TaskListener {
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
 
+        LawsUserInfoService infoService=SpringContextUtil.getBean(LawsUserInfoService.class);
 
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
@@ -89,6 +92,29 @@ public class WriteMaterialAfter implements TaskListener {
             busBean.save(busProcessNews);
         }
 
+        JSONObject object1 = object.getJSONObject("rh_pageData");
+        WgWorkGroupShowDTO wgWorkGroupShowDTO = new WgWorkGroupShowDTO();
+        if (StringUtils.isNotEmpty(object1.getString("comityName"))) {
+            wgWorkGroupShowDTO.setId(object1.getString("comityName"));
+            wgWorkGroupShowDTO.setLevel("1");
+            wgWorkGroupShowDTO.setNature("1");
+            if (StringUtils.isNotEmpty(object1.getString("comityNameOne"))) {
+                wgWorkGroupShowDTO.setId(object1.getString("comityNameOne"));
+                wgWorkGroupShowDTO.setLevel("2");
+                wgWorkGroupShowDTO.setNature("2");
+                if (StringUtils.isNotEmpty(object1.getString("comityNameTwo"))) {
+                    wgWorkGroupShowDTO.setId(object1.getString("comityNameTwo"));
+                    wgWorkGroupShowDTO.setLevel("3");
+                    wgWorkGroupShowDTO.setNature("3");
+                }
+            }
+        }
+        wgWorkGroupShowDTO.setTypes("0");
+        wgWorkGroupShowDTO.setStatus("0");
+        infoService.wg_work_group_update(wgWorkGroupShowDTO);
+
+
+
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java

@@ -45,17 +45,8 @@ public class ChooseZrAfter implements TaskListener{
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("applyUserId");
         String username = object.getString("applyUserIdName");
-        String standName = "";
+
-        if (null == object.getString("standInData")){
+        String prcName = delegateTask.getVariable("titles",String.class)+"-标准解读流程";
-            standName = "未知";
-        }else {
-            if(object.getString("standInData").equals("INLAND")){
-                standName = "国内";
-            }else {
-                standName = "海外";
-            }
-        }
-        String prcName = standName+"-标准解读流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java

@@ -44,17 +44,8 @@ public class DeptApplayAfter implements TaskListener{
 
         List<String> nextUserList = new ArrayList();
 
-        String standName = "";
+
-        if (null == object.getString("standInData")){
+        String prcName = delegateTask.getVariable("titles",String.class)+"-标准解读流程";
-            standName = "未知";
-        }else {
-            if(object.getString("standInData").equals("INLAND")){
-                standName = "国内";
-            }else {
-                standName = "海外";
-            }
-        }
-        String prcName = standName+"-标准解读流程";
 
         //部长进行审批（1：通过）
         if (object.getString("gcApplyFlag").equals("1")) {

src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java

@@ -59,17 +59,8 @@ public class DeptZrAfter implements TaskListener{
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("applyUserId");
         String username = object.getString("applyUserIdName");
-        String standName = "";
+
-        if (null == object.getString("standInData")){
+        String prcName = delegateTask.getVariable("titles",String.class)+"-标准解读流程-填写解读分析";
-            standName = "未知";
-        }else {
-            if(object.getString("standInData").equals("INLAND")){
-                standName = "国内";
-            }else {
-                standName = "海外";
-            }
-        }
-        String prcName = standName+"-标准解读流程-填写解读分析";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java

@@ -37,17 +37,8 @@ public class EngineerApplayAfter implements TaskListener{
 
         List<String> nextUserList = new ArrayList();
 
-        String standName = "";
+
-        if (null == object.getString("standInData")){
+        String prcName = delegateTask.getVariable("titles",String.class) + "-标准解读流程";
-            standName = "未知";
-        }else {
-            if(object.getString("standInData").equals("INLAND")){
-                standName = "国内";
-            }else {
-                standName = "海外";
-            }
-        }
-        String prcName = standName + "-标准解读流程";
 
         //工程师是否要进行审核
         if (object.getString("zrApplyFlag").equals("1")) {

src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java

@@ -41,17 +41,8 @@ public class ExpainAfter implements TaskListener{
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("applyUserId");
         String username = object.getString("applyUserIdName");
-        String standName = "";
+
-        if (null == object.getString("standInData")){
+        String prcName = delegateTask.getVariable("titles",String.class)+"-标准解读流程-责任人审核";
-            standName = "未知";
-        }else {
-            if(object.getString("standInData").equals("INLAND")){
-                standName = "国内";
-            }else {
-                standName = "海外";
-            }
-        }
-        String prcName = standName+"-标准解读流程-责任人审核";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java

@@ -64,17 +64,9 @@ public class ResolveAfter implements TaskListener{
         String user = object.getString("applyUserId");
         String username = object.getString("applyUserIdName");
         delegateTask.setVariable("createDate",new Date());
-        String standName = "";
+        String title=object.getString("itemsNum1")+"-"+object.getString("itemsName1");
-        if (null == object.getString("standInData")){
+        delegateTask.setVariable("titles",title);
-            standName = "未知";
+        String prcName = title+"-标准解读流程-选择执行人";
-        }else {
-            if(object.getString("standInData").equals("INLAND")){
-                standName = "国内";
-            }else {
-                standName = "海外";
-            }
-        }
-        String prcName = standName+"-标准解读流程-选择执行人";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java

@@ -38,17 +38,8 @@ public class ZrApplayAfter implements TaskListener{
         delegateTask.setVariable("objectJson",object);
 
         List<String> nextUserList = new ArrayList();
-        String standName = "";
+
-        if (null == object.getString("standInData")){
+        String prcName = delegateTask.getVariable("titles",String.class)+"-标准解读流程";
-            standName = "未知";
-        }else {
-            if(object.getString("standInData").equals("INLAND")){
-                standName = "国内";
-            }else {
-                standName = "海外";
-            }
-        }
-        String prcName = standName+"-标准解读流程";
         //责任人是否要进行审核
         if(object.getString("resolveFlag").equals("1")){
             delegateTask.setVariable("zrFlag",1);