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

src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/DistributionAfter.java

@@ -89,8 +89,8 @@ public class DistributionAfter implements TaskListener {
 
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){
+                //标记此用户是事业部还是产品规划部
                 JSONObject repositoryObject =object;
-//            TODO    if(object.getString(""));
                 if (userAndInstitutionNameMap.get(nextUser).contains("事业部")){
                     repositoryObject.put("feedbackDept","1");
                     prcName+="-责任人反馈事业部情况";

src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/ReLaunchAfter.java

@@ -78,7 +78,7 @@ public class ReLaunchAfter implements TaskListener {
         busProcessNew.setCommitText(object.getString("commentText"));
         busProcessNew.setFinishFlag("0");
         busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
+        busBean.saveOrUpdate(busProcessNew);
 
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){

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

@@ -98,9 +98,8 @@ public class MinisterAndDockerSignAfter implements TaskListener {
 
         Integer count=delegateTask.getVariable("task3OKCount",Integer.class);
         List<String> userList=delegateTask.getVariable("userList",List.class);
-
+        if(count==null)count=0;
         if(delegateTask.getVariable("actionFlag",Integer.class)==0){
-            if(count==null)count=0;
             count++;
             delegateTask.setVariable("task3OKCount",count);
         }

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java

@@ -36,31 +36,27 @@ public class DistributionAfter implements TaskListener {
         delegateTask.setVariable("objectJson",object);
 
         List<String> nextUserList = new ArrayList();
+        Map<String, String> departmentMap = new HashMap<>(); //用户--用户所属部门
 
 
         if(StringUtils.isNotBlank(object.getString("responUserList"))){
             nextUserList= Arrays.asList(object.getString("responUserList").split(","));
 
+            JSONArray mapArray = object.getJSONArray("responUserAndInstitutionNameMap");
+            for (Object jsonMap : mapArray) {
+                departmentMap.putAll(JSONObject.parseObject(jsonMap.toString(), Map.class));
+
+            }
             // 配置多实例
             delegateTask.setVariable("commentUserList",nextUserList);
             delegateTask.addCandidateUsers(nextUserList);
         }
 
-        JSONArray userListJson= JSON.parseArray(delegateTask.getVariable("responUserListInfo",String.class));
-        if(userListJson==null)userListJson=new JSONArray();
-        List<String> strings=new ArrayList<>();
-        Map<String,JSONObject> map=new HashMap<>();
 
-        for (int i = 0; i < nextUserList.size(); i++) {
+        JSONArray commentCollectionList=delegateTask.getVariable("commentCollectionList",JSONArray.class);
-            JSONObject json=new JSONObject();
+        if (commentCollectionList==null) commentCollectionList=new JSONArray();
-            json.put("id",nextUserList.get(i));
+        delegateTask.setVariable("commentCollectionList",commentCollectionList);
-            json.put("name",nextUserList.get(i));
+
-            json.put("dockUser",delegateTask.getAssignee());
-            json.put("info",new JSONArray());
-            userListJson.add(json);
-            strings.add(nextUserList.get(i));
-            map.put(nextUserList.get(i),json);
-        }
 
 
 
@@ -97,10 +93,14 @@ public class DistributionAfter implements TaskListener {
 
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){
+                //标记此用户是事业部还是产品规划部
+                JSONObject repositoryObject =object;
+                repositoryObject.put("department",departmentMap.get(nextUser));
+
                 BusProcessNew busProcessNewNext = new BusProcessNew();
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setMesg(repositoryObject.toJSONString());
                 busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                 busProcessNewNext.setFinishFlag("0");
                 busProcessNewNext.setTaskInfo(delegateTask.getName());

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewAfter.java

@@ -56,7 +56,7 @@ public class DockerReviewAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "政策征求意见流程-法规工程师修订征求意见";
+        String prcName = "政策征求意见流程-法规工程师单条审核";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewAfter.java

@@ -1,5 +1,6 @@
 package com.ydw.bat.wkflow.listener.policyCommentProcess;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
@@ -14,10 +15,7 @@ import org.activiti.engine.delegate.TaskListener;
 import org.apache.commons.lang.StringUtils;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
 
 /**
  * 工程师审核
@@ -38,10 +36,19 @@ public class EngineerReviewAfter implements TaskListener {
 
         List<String> nextUserList = new ArrayList();
 
-        if ("0".equals(object.getString("actionFlag"))){
+        if ("0".equals( object.getString("actionFlag"))){
-            String lawsProveEngineer = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
+            JSONObject form = JSONObject.parseObject(object.getString("form"));
+            String lawsProveEngineer = JSONObject.parseObject(form.getString("form")).getString("lawsProveEngineerId");
             if(StringUtils.isNotBlank(lawsProveEngineer)){
 
+                JSONArray commentCollectionList =delegateTask.getVariable("commentCollectionList", JSONArray.class);
+                if (commentCollectionList==null) {
+                    commentCollectionList=new JSONArray();
+                }
+                commentCollectionList.addAll(object.getJSONArray("info"));
+                delegateTask.setVariable("commentCollectionList",commentCollectionList);
+
+
                 delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineer);
                 delegateTask.setVariable("lawsProveEngineerVerify",0);
 
@@ -59,7 +66,7 @@ public class EngineerReviewAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "政策征求意见流程-法规工程师修订";
+        String prcName = "政策征求意见流程-法规工程师汇总修订";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -72,17 +79,30 @@ public class EngineerReviewAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+
-        BusProcessNew busProcessNew = new BusProcessNew();
+        /**
-        busProcessNew.setMsgType("clause");
+         * 当子任务结束时存储
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+         */
-        busProcessNew.setMesg(object.toJSONString());
+        Integer commentCount=delegateTask.getVariable("commentCount",Integer.class);
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        if(commentCount==null)commentCount=0;
-        busProcessNew.setTaskId(delegateTask.getId());
+        commentCount++;
-        busProcessNew.setCommitText(object.getString("commentText"));
+        delegateTask.setVariable("count",commentCount);
-        busProcessNew.setFinishFlag("0");
+
-        busProcessNew.setTaskInfo(delegateTask.getName());
+        Collection commentUserList=delegateTask.getVariable("commentUserList",Collection.class);
-        busBean.save(busProcessNew);
+        if(commentCount>=commentUserList.size()){
+            // 存储当前节点意见
+            BusProcessNew busProcessNew = new BusProcessNew();
+            busProcessNew.setMsgType("clause");
+            busProcessNew.setPId(delegateTask.getProcessInstanceId());
+            busProcessNew.setMesg(object.toJSONString());
+            busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            busProcessNew.setTaskId(delegateTask.getId());
+            busProcessNew.setCommitText(object.getString("commentText"));
+            busProcessNew.setFinishFlag("0");
+            busProcessNew.setTaskInfo(delegateTask.getName());
+            busBean.save(busProcessNew);
+        }
+
 
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java

@@ -38,8 +38,8 @@ public class EngineerRevisionAfter implements TaskListener {
 
         List<String> nextUserList = new ArrayList();
 
-
+        JSONObject form = JSONObject.parseObject(object.getString("form"));
-            String lawsProveMinister = JSONObject.parseObject(object.getString("form")).getString("lawsProveMinisterId");
+        String lawsProveMinister = JSONObject.parseObject(form.getString("form")).getString("lawsProveMinisterId");
             if(StringUtils.isNotBlank(lawsProveMinister)){
 
                 delegateTask.setVariable("lawsProveMinisterId",lawsProveMinister);

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionBefore.java

@@ -1,5 +1,8 @@
 package com.ydw.bat.wkflow.listener.policyCommentProcess;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
@@ -27,6 +30,17 @@ public class EngineerRevisionBefore implements TaskListener {
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             one1.setTaskInfo(delegateTask.getName());
+
+            /**
+             * 汇总已审批通过的意见
+             */
+            String msg = one1.getMesg();
+            JSONObject msgJsonBoj = JSON.parseObject(msg);
+            JSONArray commentCollectionList=delegateTask.getVariable("commentCollectionList",JSONArray.class);
+            msgJsonBoj.put("info",commentCollectionList);
+            one1.setMesg(msgJsonBoj.toJSONString());
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
             one1.setLink("bzrkStep2?prcType=laws2");

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java

@@ -1,5 +1,7 @@
 package com.ydw.bat.wkflow.listener.policyCommentProcess;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
@@ -39,6 +41,8 @@ public class FillCommentAfter implements TaskListener {
         List<String> nextUserList = new ArrayList();
         if(StringUtils.isNotBlank(responseDocker)){
 
+
+
             delegateTask.setVariable("responseDockerId",responseDocker);
             nextUserList= Arrays.asList(responseDocker.split(","));
             delegateTask.addCandidateUsers(nextUserList);

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewAfter.java

@@ -38,7 +38,9 @@ public class MinisterReviewAfter implements TaskListener {
         List<String> nextUserList = new ArrayList();
 
         if ("0".equals(object.getString("actionFlag"))){
-            String lawsProveViceChief = JSONObject.parseObject(object.getString("form")).getString("lawsProveViceChiefId");
+
+            JSONObject form = JSONObject.parseObject(object.getString("form"));
+            String lawsProveViceChief = JSONObject.parseObject(form.getString("form")).getString("lawsProveViceChiefId");
             if(StringUtils.isNotBlank(lawsProveViceChief)){
 
                 delegateTask.setVariable("lawsProveMinisterVerify",0);

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorAfter.java

@@ -38,7 +38,10 @@ public class ViceDirectorAfter implements TaskListener {
         List<String> nextUserList = new ArrayList();
 
         if ("0".equals(object.getString("actionFlag"))){
-            String lawsProveChief = JSONObject.parseObject(object.getString("form")).getString("lawsProveChiefId");
+
+
+            JSONObject form = JSONObject.parseObject(object.getString("form"));
+            String lawsProveChief = JSONObject.parseObject(form.getString("form")).getString("lawsProveChiefId");
             if(StringUtils.isNotBlank(lawsProveChief)){
 
                 delegateTask.setVariable("lawsProveViceChiefVerify",0);