From 0fd17b796475aea7e07be3bc872462a582fc21be Mon Sep 17 00:00:00 2001 From: koweiyi <274210Kwy> Date: Tue, 26 Oct 2021 10:53:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98=E7=BB=84?= =?UTF-8?q?=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8B---=E4=BF=AE=E8=AE=A2?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PGREPresidentApprovalAfter.java | 4 ++-- .../PRGEInspectorApprovalAfter.java | 8 ++++---- .../PRGEMinisterConfirmAfter.java | 8 ++++---- .../policyResearchGroupEnrollment/PRGEStartAfter.java | 4 ++-- .../RevisonInformationAfter.java | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java index bf2e1e04..328c30fd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java @@ -48,8 +48,8 @@ public class PGREPresidentApprovalAfter implements TaskListener { delegateTask.setVariable("gsfz", "1"); } else { delegateTask.setVariable("gsfz", "0"); - if (StringUtils.isNotBlank(object.getString("revisionInformation"))) { - delegateTask.setVariable("revisionInformation", object.getString("revisionInformation")); + if (StringUtils.isNotBlank(object.getString("revisionId"))) { + delegateTask.setVariable("revisionInformation", object.getString("revisionId")); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java index 5295ca4e..4cd6cc8a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java @@ -46,13 +46,13 @@ public class PRGEInspectorApprovalAfter implements TaskListener { if ("1".equals(object.getString("fgfzj"))) { delegateTask.setVariable("fgfzj", "1"); - if (StringUtils.isNotBlank(object.getString("presidentApproval"))) { - delegateTask.setVariable("presidentApproval", object.getString("presidentApproval")); + if (StringUtils.isNotBlank(object.getString("presidentId"))) { + delegateTask.setVariable("presidentApproval", object.getString("presidentId")); } } else if ("0".equals(object.getString("fgfzj"))) { delegateTask.setVariable("fgfzj", "0"); - if (StringUtils.isNotBlank(object.getString("revisionInformation"))){ - delegateTask.setVariable("revisionInformation", object.getString("revisionInformation")); + if (StringUtils.isNotBlank(object.getString("revisionId"))){ + delegateTask.setVariable("revisionInformation", object.getString("revisionId")); } }else{ delegateTask.setVariable("fgfzj", "2"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java index 34976211..f4569aac 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java @@ -48,13 +48,13 @@ public class PRGEMinisterConfirmAfter implements TaskListener { if("1".equals(object.getString("fgfbz"))){ delegateTask.setVariable("fgfbz", "1"); - if (StringUtils.isNotBlank(object.getString("inspectorApproval"))){ - delegateTask.setVariable("inspectorApproval", object.getString("inspectorApproval")); + if (StringUtils.isNotBlank(object.getString("inspectorId"))){ + delegateTask.setVariable("inspectorApproval", object.getString("inspectorId")); } }else{ delegateTask.setVariable("fgfbz","0"); - if (StringUtils.isNotBlank(object.getString("revisionInformation"))){ - delegateTask.setVariable("revisionInformation", object.getString("revisionInformation")); + if (StringUtils.isNotBlank(object.getString("revisionId"))){ + delegateTask.setVariable("revisionInformation", object.getString("revisionId")); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java index 25ebb302..d3d527a5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java @@ -44,8 +44,8 @@ public class PRGEStartAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - if(StringUtils.isNotBlank(object.getString("ministerConfirm"))){ - delegateTask.setVariable("ministerConfirm", object.getString("ministerConfirm")); + if(StringUtils.isNotBlank(object.getString("ministerId"))){ + delegateTask.setVariable("ministerConfirm", object.getString("ministerId")); } //截止时间 流程描述 创建人 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java index ed44fbaf..128866a5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java @@ -44,8 +44,8 @@ public class RevisonInformationAfter implements TaskListener { List nextUserList = new ArrayList(); - if (StringUtils.isNotBlank(object.getString("ministerConfirm"))) { - delegateTask.setVariable("ministerConfirm", object.getString("ministerConfirm")); + if (StringUtils.isNotBlank(object.getString("ministerId"))) { + delegateTask.setVariable("ministerConfirm", object.getString("ministerId")); }