From a1327308ec80218c624c637226874f1e943a311e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 23 Dec 2021 16:23:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E7=BB=B4=E5=BA=A6?= =?UTF-8?q?=E6=8F=90=E5=89=8D=E7=BB=93=E6=9D=9F=E6=B2=A1=E6=9C=89=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?--=E3=80=8B=E3=80=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectEvaluationProcess/PEPmanagerApproveAfter.java | 3 +++ 1 file changed, 3 insertions(+) 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); From 01bdd8ccf1e907be95794573f039007dbe8752a4 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 23 Dec 2021 17:13:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=BB=B4=E5=BA=A6-->=E5=8F=AA=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=B8=80=E4=B8=AA=E6=9D=A1=E6=AC=BE=E5=B8=A6=E5=87=BA?= =?UTF-8?q?=E6=A0=87=E5=87=86bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PCAffLiableDistributeAfter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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);