diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPSumAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPSumAfter.java index 10a1d169..b9ab69fc 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPSumAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPSumAfter.java @@ -95,6 +95,5 @@ public class PEPSumAfter implements TaskListener { busBean.save(busProcessNewNext); } } -// throw new ActivitiException("Slkenaiufcuqgiurwajkgnl23n"); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueAfter.java index ae5db504..57a843c7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueAfter.java @@ -39,82 +39,74 @@ public class PEPtaskLssueAfter implements TaskListener { JSONArray object1 = JSONArray.parseArray(datas.getFormValsJson()); List step3DTOS = JSONArray.parseArray(datas.getFormValsJson(), Step3DTO.class); - Map map = new HashMap(); - map.put(step3DTOS.get(0).getDistributePersonId(), datas.getFormValsJson()); - delegateTask.setVariable("Step3", map); - //流程下发给对应的人 - List peoples = delegateTask.getVariable("liablePeopleList", List.class); - List workPeoples=new ArrayList<>(); - List res = new ArrayList<>(); - Map> maps=new HashMap(); - for (String s : peoples) { - if (null!=map.get(s)) { - res.addAll(JSONArray.parseArray(String.valueOf(map.get(s)), Step3DTO.class)); - JSONArray.parseArray(String.valueOf(map.get(s)), Step3DTO.class).forEach(step3DTO -> { + Map map = new HashMap(); + map.put(step3DTOS.get(0).getDistributePersonId(), datas.getFormValsJson()); + delegateTask.setVariable("Step3", map); + //流程下发给对应的人 + List peoples = delegateTask.getVariable("liablePeopleList", List.class); + List workPeoples = new ArrayList<>(); + List res = new ArrayList<>(); + Map> maps = new HashMap(); + for (String s : peoples) { + if (null != map.get(s)) { + res.addAll(JSONArray.parseArray(String.valueOf(map.get(s)), Step3DTO.class)); + JSONArray.parseArray(String.valueOf(map.get(s)), Step3DTO.class).forEach(step3DTO -> { + List users = new ArrayList<>(Arrays.asList(step3DTO.getImplementerId().split(","))); + users.forEach(s1 -> { step3DTO.setCertifiedEngineerName(String.valueOf(delegateTask.getVariable("certifiedEngineerName"))); step3DTO.setQualityEngineerName(String.valueOf(delegateTask.getVariable("qualityEngineerName"))); - if (!workPeoples.contains(step3DTO.getImplementerId())) { - workPeoples.add(step3DTO.getImplementerId()); + if (!workPeoples.contains(s1)) { + workPeoples.add(s1); } - if (null != maps.get(step3DTO.getImplementerId())) { - maps.get(step3DTO.getImplementerId()).add(step3DTO); + if (null != maps.get(s1)) { + maps.get(s1).add(step3DTO); } else { List dtos = new ArrayList<>(); dtos.add(step3DTO); - maps.put(step3DTO.getImplementerId(), dtos); + maps.put(s1, dtos); } }); - } - } - if (null==delegateTask.getVariable("workPeoples")) { - delegateTask.setVariable("workPeoples", workPeoples); - }else { - delegateTask.getVariable("workPeoples",List.class).addAll(workPeoples); - } - //截止时间 流程描述 创建人 - String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = delegateTask.getVariable("prcCreateUser", String.class); - String username = delegateTask.getVariable("prcCreateUserName", String.class); - String prcName = "标准项目合规评估-合规性评估"; - QueryWrapper queryWrapper2 = new QueryWrapper(); - queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); - BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); - if (one1 != null) { - one1.setOverTime(OVERTIME); - one1.setPrcType("5"); - one1.setPrcName(prcName); - one1.setCreatUser(user); - one1.setCreatUserName(username); - busProcessNameService.saveOrUpdate(one1); - } - // 存储当前节点意见 - -// BusProcessNew busProcessNew = new BusProcessNew(); -// PEPres pePres=new PEPres(); -// pePres.setStep3DTOS(res); -// busProcessNew.setMsgType("clause"); -// busProcessNew.setPId(delegateTask.getProcessInstanceId()); -// busProcessNew.setMesg(JSONObject.toJSONString(pePres)); -// busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); -// busProcessNew.setTaskId(delegateTask.getId()); -// busProcessNew.setFinishFlag("0"); -// busProcessNew.setTaskInfo(delegateTask.getName()); -// busBean.saveOrUpdate(busProcessNew); - //更改遍历方式!!遍历生成的数据条数 每条都要判断!! - if (workPeoples != null && !workPeoples.isEmpty()) { - for (String nextUser : workPeoples) { - PEPres press=new PEPres(); - press.setStep3DTOS(maps.get(nextUser)); - BusProcessNew busProcessNewNext = new BusProcessNew(); - busProcessNewNext.setMsgType("clause"); - busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(JSONObject.toJSONString(press)); - busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(nextUser); - busBean.save(busProcessNewNext); - } + }); } } + if (null == delegateTask.getVariable("workPeoples")) { + delegateTask.setVariable("workPeoples", workPeoples); + } else { + delegateTask.getVariable("workPeoples", List.class).addAll(workPeoples); + } + //截止时间 流程描述 创建人 + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = delegateTask.getVariable("prcCreateUser", String.class); + String username = delegateTask.getVariable("prcCreateUserName", String.class); + String prcName = "标准项目合规评估-合规性评估"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setOverTime(OVERTIME); + one1.setPrcType("5"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + + //更改遍历方式!!遍历生成的数据条数 每条都要判断!! + if (workPeoples != null && !workPeoples.isEmpty()) { + for (String nextUser : workPeoples) { + PEPres press = new PEPres(); + press.setStep3DTOS(maps.get(nextUser)); + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(JSONObject.toJSONString(press)); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busBean.save(busProcessNewNext); + } + } + } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java index 3d565d35..b8151c33 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java @@ -105,16 +105,19 @@ public class SRPstartAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.save(busProcessNew); + // 存储当前节点意见 + if (null!=object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID",delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if(!list.isEmpty()){ + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ BusProcessNew busProcessNewNext = new BusProcessNew();