From 4f9824103a2f22a65f922f85d4040798b71cc619 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 5 Feb 2024 16:56:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=8D=E7=82=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=A0=87=E5=87=86/=E6=94=BF=E7=AD=96=E5=90=88=E8=A7=84?= =?UTF-8?q?=E6=80=A7=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=9F=A5=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9=20=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E8=8A=82=E7=82=B9=E9=A9=B3=E5=9B=9E=E5=90=8E?= =?UTF-8?q?=E5=88=B0=E7=AE=A1=E7=90=86=E5=91=98=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PolicyComplianceProgramReviewProcess11After.java | 3 +++ .../PolicyComplianceProgramReviewProcess12After.java | 9 ++++++--- .../PolicyComplianceProgramReviewProcess13After.java | 9 ++++++--- .../PolicyComplianceProgramReviewProcess14After.java | 9 ++++++--- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess11After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess11After.java index 0d50758d..2ecd318b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess11After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess11After.java @@ -17,6 +17,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * 管理员节点后置处理 + */ public class PolicyComplianceProgramReviewProcess11After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess12After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess12After.java index 2ef78d28..bb298150 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess12After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess12After.java @@ -20,6 +20,9 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +/** + * 审核后 + */ public class PolicyComplianceProgramReviewProcess12After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -71,7 +74,7 @@ public class PolicyComplianceProgramReviewProcess12After implements TaskListener } } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -79,10 +82,10 @@ public class PolicyComplianceProgramReviewProcess12After implements TaskListener busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("glyUserId", glyUserId); delegateTask.setVariable("shr2UserOverruleCount", 1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess13After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess13After.java index 03a129a7..cb5bf693 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess13After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess13After.java @@ -18,6 +18,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * 审定后 + */ public class PolicyComplianceProgramReviewProcess13After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -55,7 +58,7 @@ public class PolicyComplianceProgramReviewProcess13After implements TaskListener delegateTask.setVariable("pzr2UserId", pzr2UserId); } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -63,10 +66,10 @@ public class PolicyComplianceProgramReviewProcess13After implements TaskListener busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("pzr1UserId", glyUserId); delegateTask.setVariable("sdr2UserOverruleCount", 1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess14After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess14After.java index 43a1a32d..c35c3005 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess14After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess14After.java @@ -18,6 +18,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * 批准后 + */ public class PolicyComplianceProgramReviewProcess14After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -54,7 +57,7 @@ public class PolicyComplianceProgramReviewProcess14After implements TaskListener delegateTask.setVariable("csrUserIdList", nextUserList); } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -62,10 +65,10 @@ public class PolicyComplianceProgramReviewProcess14After implements TaskListener busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("glyUserId", glyUserId); } // 存储当前节点意见