FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

标准合规评估流程！！！

Browse Source
This commit is contained in:
yuezhihang
2021-07-21 16:40:45 +08:00
parent e5ede92abc
commit fadac229ba
3 changed files with 73 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPSumAfter.java
-1
View File
@@ -95,6 +95,5 @@ public class PEPSumAfter implements TaskListener {
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
} }
} }
// throw new ActivitiException("Slkenaiufcuqgiurwajkgnl23n");
} }
} }
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueAfter.java
+15 -23
View File
@@ -44,32 +44,35 @@ public class PEPtaskLssueAfter implements TaskListener {
delegateTask.setVariable("Step3", map); delegateTask.setVariable("Step3", map);
//流程下发给对应的人 //流程下发给对应的人
List<String> peoples = delegateTask.getVariable("liablePeopleList", List.class); List<String> peoples = delegateTask.getVariable("liablePeopleList", List.class);
List<String> workPeoples=new ArrayList<>(); List<String> workPeoples = new ArrayList<>();
List<Step3DTO> res = new ArrayList<>(); List<Step3DTO> res = new ArrayList<>();
Map<String,List<Step3DTO>> maps=new HashMap(); Map<String, List<Step3DTO>> maps = new HashMap();
for (String s : peoples) { for (String s : peoples) {
if (null!=map.get(s)) { if (null != map.get(s)) {
res.addAll(JSONArray.parseArray(String.valueOf(map.get(s)), Step3DTO.class)); res.addAll(JSONArray.parseArray(String.valueOf(map.get(s)), Step3DTO.class));
JSONArray.parseArray(String.valueOf(map.get(s)), Step3DTO.class).forEach(step3DTO -> { JSONArray.parseArray(String.valueOf(map.get(s)), Step3DTO.class).forEach(step3DTO -> {
List<String> users = new ArrayList<>(Arrays.asList(step3DTO.getImplementerId().split(",")));
users.forEach(s1 -> {
step3DTO.setCertifiedEngineerName(String.valueOf(delegateTask.getVariable("certifiedEngineerName"))); step3DTO.setCertifiedEngineerName(String.valueOf(delegateTask.getVariable("certifiedEngineerName")));
step3DTO.setQualityEngineerName(String.valueOf(delegateTask.getVariable("qualityEngineerName"))); step3DTO.setQualityEngineerName(String.valueOf(delegateTask.getVariable("qualityEngineerName")));
if (!workPeoples.contains(step3DTO.getImplementerId())) { if (!workPeoples.contains(s1)) {
workPeoples.add(step3DTO.getImplementerId()); workPeoples.add(s1);
} }
if (null != maps.get(step3DTO.getImplementerId())) { if (null != maps.get(s1)) {
maps.get(step3DTO.getImplementerId()).add(step3DTO); maps.get(s1).add(step3DTO);
} else { } else {
List<Step3DTO> dtos = new ArrayList<>(); List<Step3DTO> dtos = new ArrayList<>();
dtos.add(step3DTO); dtos.add(step3DTO);
maps.put(step3DTO.getImplementerId(), dtos); maps.put(s1, dtos);
} }
}); });
});
} }
} }
if (null==delegateTask.getVariable("workPeoples")) { if (null == delegateTask.getVariable("workPeoples")) {
delegateTask.setVariable("workPeoples", workPeoples); delegateTask.setVariable("workPeoples", workPeoples);
}else { } else {
delegateTask.getVariable("workPeoples",List.class).addAll(workPeoples); delegateTask.getVariable("workPeoples", List.class).addAll(workPeoples);
} }
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
@@ -89,21 +92,10 @@ public class PEPtaskLssueAfter implements TaskListener {
} }
// 存储当前节点意见 // 存储当前节点意见
// 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()) { if (workPeoples != null && !workPeoples.isEmpty()) {
for (String nextUser : workPeoples) { for (String nextUser : workPeoples) {
PEPres press=new PEPres(); PEPres press = new PEPres();
press.setStep3DTOS(maps.get(nextUser)); press.setStep3DTOS(maps.get(nextUser));
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause"); busProcessNewNext.setMsgType("clause");
src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java
+13 -10
View File
@@ -105,16 +105,19 @@ public class SRPstartAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1); busProcessNameService.saveOrUpdate(one1);
} }
// 存储当前节点意见 // 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); // 存储当前节点意见
busProcessNew.setMsgType("clause"); if (null!=object.getString("commentText")) {
busProcessNew.setPId(delegateTask.getProcessInstanceId()); QueryWrapper queryWrapper3 = new QueryWrapper();
busProcessNew.setMesg(object.toJSONString()); queryWrapper3.eq("TASK_ID", delegateTask.getId());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); queryWrapper3.eq("USER_ID",delegateTask.getAssignee());
busProcessNew.setTaskId(delegateTask.getId()); List<BusProcessNew> list = busBean.list(queryWrapper3);
busProcessNew.setCommitText(object.getString("commentText")); if(!list.isEmpty()){
busProcessNew.setFinishFlag("0"); BusProcessNew busProcessNews = list.get(0);
busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNews.setTaskId(delegateTask.getId());
busBean.save(busProcessNew); busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
if(nextUserList != null && !nextUserList.isEmpty()){ if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){ for(String nextUser : nextUserList){
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();