From 96ac4a5e6b8f6390ad00979b1a9ace565f34f82e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 21 Oct 2021 14:09:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E6=B5=81=E7=A8=8B=20=E5=88=86=E5=8F=91=E5=A4=9A?= =?UTF-8?q?=E4=BA=BA=E6=95=B0=E6=8D=AE=E4=B8=8D=E6=B1=87=E6=80=BBbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SelectResponsibleUserAfter.java | 17 +++++++++++++---- .../SummarySurveyBefore.java | 4 +++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java index 0cfe3893..cafa38cf 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java +++ b/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 busProcessNews=new ArrayList<>(); 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 e86be5fa..3322a6cd 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 @@ -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()); }