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

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

@@ -77,8 +77,19 @@ public class SelectResponsibleUserAfter implements TaskListener {
         delegateTask.setVariable("responUserCompletedCount",0);
 
         Integer selectResponCompletedCount=delegateTask.getVariable("selectResponCompletedCount",Integer.class);
-        if(selectResponCompletedCount==null)selectResponCompletedCount=0;
-        selectResponCompletedCount++;
+        if(selectResponCompletedCount==null){
+            selectResponCompletedCount=0;
+        }else {
+            selectResponCompletedCount++;
+
+            if (null!=delegateTask.getVariable("datas")) {
+                Map map1=delegateTask.getVariable("datas",Map.class);
+                map1.putAll(map);
+                delegateTask.setVariable("datas", map1);
+            }else {
+                delegateTask.setVariable("datas", map);
+            }
+        }
         delegateTask.setVariable("selectResponCompletedCount",selectResponCompletedCount);
 
         //截止时间 流程描述 创建人
@@ -125,8 +136,6 @@ public class SelectResponsibleUserAfter implements TaskListener {
         if(selectResponCompletedCount>=dockUserList.size()){
 
             delegateTask.setVariable("zqazqazqaUserList", delegateTask.getVariable("zs",List.class));
-            delegateTask.setVariable("datas",map);
-
 
             if(nextUserList != null && !nextUserList.isEmpty()){
                 List<BusProcessNew> busProcessNews=new ArrayList<>();

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

@@ -30,6 +30,7 @@ public class SummarySurveyBefore implements TaskListener {
             JSONArray array = JSON.parseArray(delegateTask.getVariable("responUserListInfo",String.class));
             if(!one1.getMesg().contains("summaryList")){
                 JSONArray summaryList=new JSONArray();
+                JSONArray infoLists=new JSONArray();
 
                 for (Object o : array) {
                     JSONObject object=(JSONObject)o;
@@ -50,11 +51,12 @@ public class SummarySurveyBefore implements TaskListener {
                         summaryEntity.put("commentText",info.getString("commentText"));//修改意见内容
                         summaryEntity.put("state",null);//修改意见内容
                         summaryEntity.put("stateInfo",null);//修改意见内容
-
+                        infoLists.add(info);
                         summaryList.add(summaryEntity);
                     }
                 }
                 obj.put("summaryList",summaryList);
+                obj.put("info",infoLists);
                 obj.put("unique",delegateTask.getVariable("uniqueMark",String.class));
                 one1.setMesg(obj.toJSONString());
             }