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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2021-12-23 21:58:52 +08:00
parent 1158db2079 01bdd8ccf1
commit 20d01898b8
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java
+2 -2
View File
@@ -94,8 +94,8 @@ public class PCAffLiableDistributeAfter implements TaskListener {
List<PCAdataList> list2 = new ArrayList<>(); List<PCAdataList> list2 = new ArrayList<>();
PCAdataList adataLists = new PCAdataList(); PCAdataList adataLists = new PCAdataList();
BeanUtils.copyProperties(mapData.get(middle.getKey()), adataLists); BeanUtils.copyProperties(mapData.get(middle.getKey()), adataLists);
adataLists.setWorkPeopleId(id); // adataLists.setWorkPeopleId(id);
adataLists.setWorkPeople(names.get(i)); // adataLists.setWorkPeople(names.get(i));
adataLists.setChildren(list1); adataLists.setChildren(list1);
list2.add(adataLists); list2.add(adataLists);
pcs.setDataList(list2); pcs.setDataList(list2);
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveAfter.java
+3
View File
@@ -58,6 +58,9 @@ public class PEPmanagerApproveAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) { if (one1 != null) {
if (null!=object.get("passFlag")){
one1.setOverTime(OVERTIME);
}
one1.setPrcType("5"); one1.setPrcType("5");
one1.setPrcName(prcName); one1.setPrcName(prcName);
one1.setCreatUser(user); one1.setCreatUser(user);