From 7651245585750da7c77058e125e25074d9c7647c Mon Sep 17 00:00:00 2001
From: zj <1376702416@qq.com>
Date: Thu, 29 Jul 2021 16:49:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=81=E6=B1=82=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E6=B5=81=E7=A8=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StartSurveyAfter.java                     |  5 ++-
 .../SummarySurveyBefore.java                  | 36 +++++++++++++++++--
 .../StandardSurvey/StartSurveyAfter.java      |  5 ++-
 3 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java
index ebdc7ecc..bdef2d09 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java
@@ -68,9 +68,8 @@ public class StartSurveyAfter implements TaskListener {
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-//        object.getString("standName")
-        String standName = "";
-        String prcName = standName+"标准征求意见流程";
+        String standName = object.getString("cname");
+        String prcName = standName+"-标准征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyBefore.java
index d2715bed..62cff04f 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyBefore.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyBefore.java
@@ -22,6 +22,39 @@ public class SummarySurveyBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            String mesg = one1.getMesg();
+            JSONObject obj = JSON.parseObject(mesg);
+            JSONArray array = JSON.parseArray(delegateTask.getVariable("responUserListInfo",String.class));
+            if(!one1.getMesg().contains("summaryList")){
+                JSONArray summaryList=new JSONArray();
+
+                for (Object o : array) {
+                    JSONObject object=(JSONObject)o;
+                    JSONArray infoList=object.getObject("info",JSONArray.class);
+
+                    for (Object o1 : infoList) {
+                        JSONObject summaryEntity=new JSONObject();
+                        JSONObject info=(JSONObject)o1;//info 具体反馈的信息
+
+                        summaryEntity.put("responUser",object.getString("id"));
+                        summaryEntity.put("responUserName",object.getString("name"));
+                        summaryEntity.put("department",object.getString("department"));
+                        summaryEntity.put("dockUser",object.getString("dockUser"));
+                        summaryEntity.put("chapterNumber",info.getString("chapterNumber"));//章节编号
+                        summaryEntity.put("chapterName",info.getString("chapterName"));//章节名称
+                        summaryEntity.put("commentText",info.getString("commentText"));//修改意见内容
+                        summaryEntity.put("state",null);//修改意见内容
+                        summaryEntity.put("stateInfo",null);//修改意见内容
+
+                        summaryList.add(summaryEntity);
+                    }
+                }
+                obj.put("summaryList",summaryList);
+                one1.setMesg(obj.toJSONString());
+            }
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
+            busBean.saveOrUpdate(one1);
 
             /*JSONObject obj= JSON.parseObject(one1.getMesg());
 
@@ -58,9 +91,6 @@ public class SummarySurveyBefore implements TaskListener {
             delegateTask.setVariable("summaryList",summaryList.toJSONString());
 
             one1.setMesg(obj.toJSONString());*/
-            one1.setTaskId(delegateTask.getId());
-            one1.setTaskInfo(delegateTask.getName());
-            busBean.saveOrUpdate(one1);
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java
index cf7a81f1..4e6cadcc 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java
@@ -66,9 +66,8 @@ public class StartSurveyAfter implements TaskListener {
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-//        object.getString("standName")
-        String standName = "";
-        String prcName = standName+"标准调研流程";
+        String standName = object.getString("standName");
+        String prcName = "标准调研流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);