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-12-05 20:56:08 +08:00
parent 0f78d8a78b
commit a2083fa80c
1 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java
+34 -19
View File
@@ -65,14 +65,23 @@ public class confirmAfter implements TaskListener {
}); });
} }
//草拟吗 //草拟吗
map.keySet().forEach(s -> {
res.add(map.get(s));
});
successmap.keySet().forEach(s -> { successmap.keySet().forEach(s -> {
if (!standIds.contains(s)){ res.add(successmap.get(s));
res.add(successmap.get(s)); });
map.keySet().forEach(s -> {
if (successIds.contains(s)) {
JSONObject jsonObject=successmap.get(s);
jsonObject.put("involve","involve");
jsonObject.put("remarks",map.get(s).getString("remarks"));
}else {
res.add(map.get(s));
} }
}); });
// successmap.keySet().forEach(s -> {
// if (!standIds.contains(s)){
// res.add(successmap.get(s));
// }
// });
object.put("dataList",res); object.put("dataList",res);
} }
nextUserList.add(delegateTask.getVariable("cpManager",String.class)); nextUserList.add(delegateTask.getVariable("cpManager",String.class));
@@ -113,25 +122,31 @@ public class confirmAfter implements TaskListener {
} }
private void makeData(Map<String, JSONObject> map, Map<String, JSONObject> successmap, List<String> standIds, List<String> successIds, JSONObject object1, JSONObject object11) { private void makeData(Map<String, JSONObject> map, Map<String, JSONObject> successmap, List<String> standIds, List<String> successIds, JSONObject object1, JSONObject object11) {
if (!standIds.contains(object11.getString("standId"))){ // if (!standIds.contains(object11.getString("standId"))){
if ("noInvolve".equals(object11.getString("involve"))){ if ("noInvolve".equals(object11.getString("involve"))){
object11.put("remarks",object1.getString("currentPerson")+":"+object11.getString("remarks")); if (!standIds.contains(object11.getString("standId"))) {
standIds.add(object11.getString("standId")); object11.put("remarks", object1.getString("currentPerson") + ":" + object11.getString("remarks"));
map.put(object11.getString("standId"),object11); standIds.add(object11.getString("standId"));
map.put(object11.getString("standId"), object11);
}else {
standIds.add(object11.getString("standId"));
map.get(object11.getString("standId")).put("remarks",map.get(object11.getString("standId")).getString("remarks")+","+object1.getString("currentPerson")+":"+object11.getString("remarks"));
}
}else { }else {
if (!successIds.contains(object11.getString("standId"))) { if (!successIds.contains(object11.getString("standId"))) {
successmap.put(object11.getString("standId"),object11); successmap.put(object11.getString("standId"),object11);
successIds.add(object11.getString("standId"));
} }
} }
}else { // }else {
if ("noInvolve".equals(object11.getString("involve"))){ // if ("noInvolve".equals(object11.getString("involve"))){
standIds.add(object11.getString("standId")); // standIds.add(object11.getString("standId"));
map.get(object11.getString("standId")).put("remarks",map.get(object11.getString("standId")).getString("remarks")+","+object1.getString("currentPerson")+":"+object11.getString("remarks")); // map.get(object11.getString("standId")).put("remarks",map.get(object11.getString("standId")).getString("remarks")+","+object1.getString("currentPerson")+":"+object11.getString("remarks"));
}else { // }else {
if (!successIds.contains(object11.getString("standId"))) { // if (!successIds.contains(object11.getString("standId"))) {
successmap.put(object11.getString("standId"),object11); // successmap.put(object11.getString("standId"),object11);
} // }
} // }
} // }
} }
} }