diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java index 36877c46..a9f23a95 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java @@ -117,6 +117,7 @@ public class SelectResponsibleUserAfter implements TaskListener { JSONObject jsonObject = responUserList.getJSONObject(i); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); + object.put("docUser",jsonObject.getString("dockUser")); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2After.java index abd8728a..27d665d6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2After.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.bussLibrary; +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 +40,14 @@ public class BussLibrary2After implements TaskListener{ List nextUserList = new ArrayList(); + JSONArray fileList =delegateTask.getVariable("fileModelList", JSONArray.class); + if (fileList==null) { + fileList=new JSONArray(); + } + + fileList.addAll(object.getJSONArray("fileModelList")); + delegateTask.setVariable("fileModelList",fileList); + if(StringUtils.isNotBlank(object.getString("hzUserId"))){ delegateTask.setVariable("hzUserId",object.getString("hzUserId")); nextUserList.add(object.getString("hzUserId")); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3Before.java index 96ea2888..6baa7fc6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3Before.java @@ -1,5 +1,8 @@ package com.ydw.bat.wkflow.listener.bussLibrary; +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; @@ -25,6 +28,15 @@ public class BussLibrary3Before implements TaskListener{ List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + /** + * 汇总企标编写文件列表 + */ + String msg = one1.getMesg(); + JSONObject jsonObject = JSON.parseObject(msg); + JSONArray fileList=delegateTask.getVariable("fileModelList",JSONArray.class); + jsonObject.put("fileModelList",fileList); + one1.setMesg(jsonObject.toJSONString()); + one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java index 525da14c..be17daa3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java @@ -44,10 +44,8 @@ public class RevisonInformationAfter implements TaskListener { List nextUserList = new ArrayList(); - if (StringUtils.isNotBlank(object.getString("ministerId"))) { - nextUserList.add(object.getString("ministerId")); - delegateTask.setVariable("ministerConfirm", nextUserList); -// delegateTask.setVariable("ministerConfirm", object.getString("ministerId")); + if (StringUtils.isNotBlank(delegateTask.getVariable("ministerConfirm",String.class))) { + nextUserList.add(delegateTask.getVariable("ministerConfirm",String.class)); } String user = delegateTask.getVariable("createUser", String.class); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java index 1f83bd38..fc80590b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java @@ -63,10 +63,18 @@ public class PEPtaskEstimateAfter implements TaskListener { object.put("key", uuid); //设置分发负责人 List nextUserList = new ArrayList(); - JSONObject object1 = JSONObject.parseObject(ne.getString(0)); - if (StringUtils.isNotBlank(object1.getString("distributePersonId"))) { - delegateTask.setVariable("ffUserId", object1.getString("distributePersonId")); - nextUserList.add(delegateTask.getVariable("ffUserId", String.class)); + if (null!=ne && ne.size()>0) { + JSONObject object1 = JSONObject.parseObject(remove.getString(0)); + if (StringUtils.isNotBlank(object1.getString("distributePersonId"))) { + delegateTask.setVariable("ffUserId", object1.getString("distributePersonId")); + nextUserList.add(delegateTask.getVariable("ffUserId", String.class)); + } + }else if (null!=remove && remove.size()>0){ + JSONObject object1 = JSONObject.parseObject(remove.getString(0)); + if (StringUtils.isNotBlank(object1.getString("distributePersonId"))) { + delegateTask.setVariable("ffUserId", object1.getString("distributePersonId")); + nextUserList.add(delegateTask.getVariable("ffUserId", String.class)); + } } //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());