From ac879208a4c38798e6ad038f68162a2a5f069d3f Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 4 Nov 2021 17:57:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EngineerRevisionBefore.java                    | 14 ++++++++++++++
 .../policyCommentProcess/FillCommentAfter.java     | 11 +++++++++++
 2 files changed, 25 insertions(+)

diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionBefore.java
index d1543447..c0b22a0a 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionBefore.java
+++ b/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");
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java
index 78676eed..c8fbf5a1 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java
+++ b/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,15 @@ public class FillCommentAfter implements TaskListener {
         List<String> nextUserList = new ArrayList();
         if(StringUtils.isNotBlank(responseDocker)){
 
+
+            JSONArray commentCollectionList =delegateTask.getVariable("commentCollectionList", JSONArray.class);
+            if (commentCollectionList==null) {
+                commentCollectionList=new JSONArray();
+            }
+            commentCollectionList.addAll(object.getJSONArray("info"));
+
+
+            delegateTask.setVariable("commentCollectionList",commentCollectionList);
             delegateTask.setVariable("responseDockerId",responseDocker);
             nextUserList= Arrays.asList(responseDocker.split(","));
             delegateTask.addCandidateUsers(nextUserList);