diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java index f160367a..3c4d0208 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java @@ -94,8 +94,8 @@ public class PCAffLiableDistributeAfter implements TaskListener { List list2 = new ArrayList<>(); PCAdataList adataLists = new PCAdataList(); BeanUtils.copyProperties(mapData.get(middle.getKey()), adataLists); - adataLists.setWorkPeopleId(id); - adataLists.setWorkPeople(names.get(i)); +// adataLists.setWorkPeopleId(id); +// adataLists.setWorkPeople(names.get(i)); adataLists.setChildren(list1); list2.add(adataLists); pcs.setDataList(list2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveAfter.java index b0759d5d..52496095 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveAfter.java @@ -58,6 +58,9 @@ public class PEPmanagerApproveAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { + if (null!=object.get("passFlag")){ + one1.setOverTime(OVERTIME); + } one1.setPrcType("5"); one1.setPrcName(prcName); one1.setCreatUser(user);