From c62cfc25a6826ed4989ffcb70699c04f34066752 Mon Sep 17 00:00:00 2001 From: Koi-tsk <337023856@qq.com> Date: Wed, 31 Aug 2022 15:31:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=AE=A1=E6=89=B9=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E7=9A=84=E8=8A=82=E7=82=B9=E4=B8=8D=E5=8F=91=E6=B6=88?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/renren/common/aspect/ActivitiNoticeAspect.java | 4 ++++ .../processForm/listener/v3/ApplyDistrictListener.java | 2 ++ .../renren/modules/processForm/listener/v3/CityListener.java | 2 ++ .../modules/processForm/listener/v3/CorrectionListenerV3.java | 2 ++ .../processForm/listener/v3/OwnerDistrictListener.java | 2 ++ 5 files changed, 12 insertions(+) diff --git a/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java b/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java index 62aae59d..ee418391 100644 --- a/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java +++ b/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java @@ -323,6 +323,10 @@ public class ActivitiNoticeAspect { private void assignment_notice(final DelegateTask delegateTask, final ActivitiNoticeOperation activitiNoticeOperation) { Map kv = delegateTask.getVariables(); LOGGER.error("表单：{}", JSON.toJSONString(kv)); + if(delegateTask.getId().equals(kv.get("autoApply"))){ + LOGGER.error("------------自动审批通过，不通知------------"); + return; + } String key = null; if (kv.containsKey("id")) { key = kv.getOrDefault("id", "").toString(); diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/ApplyDistrictListener.java b/renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/ApplyDistrictListener.java index df0ce880..42911dd1 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/ApplyDistrictListener.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/ApplyDistrictListener.java @@ -129,6 +129,7 @@ public class ApplyDistrictListener implements TaskListener, ExecutionListener, A taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "审批人为发起人，默认通过"); taskService.setVariable(delegateTask.getId(), ActTaskService.Task_HANDLE_STATE, ActTaskService.Task_HANDLE_STATE_AGREE); taskService.setVariable(delegateTask.getId(), "backToFirst", Boolean.FALSE); + taskService.setVariable(delegateTask.getId(), "autoApply", delegateTask.getId()); taskService.complete(delegateTask.getId(), delegateTask.getVariables()); return; } @@ -139,6 +140,7 @@ public class ApplyDistrictListener implements TaskListener, ExecutionListener, A taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "审批人重复，默认通过"); taskService.setVariable(delegateTask.getId(), ActTaskService.Task_HANDLE_STATE, ActTaskService.Task_HANDLE_STATE_AGREE); taskService.setVariable(delegateTask.getId(), "backToFirst", Boolean.FALSE); + taskService.setVariable(delegateTask.getId(), "autoApply", delegateTask.getId()); taskService.complete(delegateTask.getId(), delegateTask.getVariables()); return; } diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/CityListener.java b/renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/CityListener.java index c97b2834..01ff940d 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/CityListener.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/CityListener.java @@ -130,6 +130,7 @@ public class CityListener implements TaskListener, ExecutionListener, ActivitiEv taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "审批人为发起人，默认通过"); taskService.setVariable(delegateTask.getId(), ActTaskService.Task_HANDLE_STATE, ActTaskService.Task_HANDLE_STATE_AGREE); taskService.setVariable(delegateTask.getId(), "backToFirst", Boolean.FALSE); + taskService.setVariable(delegateTask.getId(), "autoApply", delegateTask.getId()); taskService.complete(delegateTask.getId(), delegateTask.getVariables()); return; } @@ -140,6 +141,7 @@ public class CityListener implements TaskListener, ExecutionListener, ActivitiEv taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "审批人重复，默认通过"); taskService.setVariable(delegateTask.getId(), ActTaskService.Task_HANDLE_STATE, ActTaskService.Task_HANDLE_STATE_AGREE); taskService.setVariable(delegateTask.getId(), "backToFirst", Boolean.FALSE); + taskService.setVariable(delegateTask.getId(), "autoApply", delegateTask.getId()); taskService.complete(delegateTask.getId(), delegateTask.getVariables()); return; } diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/CorrectionListenerV3.java b/renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/CorrectionListenerV3.java index 50db6543..c9cf6321 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/CorrectionListenerV3.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/CorrectionListenerV3.java @@ -222,6 +222,7 @@ public class CorrectionListenerV3 implements TaskListener, ExecutionListener, Ac taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "审批人为发起人，默认通过"); taskService.setVariable(delegateTask.getId(), ActTaskService.Task_HANDLE_STATE, ActTaskService.Task_HANDLE_STATE_AGREE); taskService.setVariable(delegateTask.getId(), "backToFirst", Boolean.FALSE); + taskService.setVariable(delegateTask.getId(), "autoApply", delegateTask.getId()); taskService.complete(delegateTask.getId(), delegateTask.getVariables()); return; } @@ -232,6 +233,7 @@ public class CorrectionListenerV3 implements TaskListener, ExecutionListener, Ac taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "审批人重复，默认通过"); taskService.setVariable(delegateTask.getId(), ActTaskService.Task_HANDLE_STATE, ActTaskService.Task_HANDLE_STATE_AGREE); taskService.setVariable(delegateTask.getId(), "backToFirst", Boolean.FALSE); + taskService.setVariable(delegateTask.getId(), "autoApply", delegateTask.getId()); taskService.complete(delegateTask.getId(), delegateTask.getVariables()); return; } diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/OwnerDistrictListener.java b/renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/OwnerDistrictListener.java index 85705ec5..c31b454c 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/OwnerDistrictListener.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/OwnerDistrictListener.java @@ -126,6 +126,7 @@ public class OwnerDistrictListener implements TaskListener, ExecutionListener, A taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "审批人为发起人，默认通过"); taskService.setVariable(delegateTask.getId(), ActTaskService.Task_HANDLE_STATE, ActTaskService.Task_HANDLE_STATE_AGREE); taskService.setVariable(delegateTask.getId(), "backToFirst", Boolean.FALSE); + taskService.setVariable(delegateTask.getId(), "autoApply", delegateTask.getId()); taskService.complete(delegateTask.getId(), delegateTask.getVariables()); return; } @@ -136,6 +137,7 @@ public class OwnerDistrictListener implements TaskListener, ExecutionListener, A taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "审批人重复，默认通过"); taskService.setVariable(delegateTask.getId(), ActTaskService.Task_HANDLE_STATE, ActTaskService.Task_HANDLE_STATE_AGREE); taskService.setVariable(delegateTask.getId(), "backToFirst", Boolean.FALSE); + taskService.setVariable(delegateTask.getId(), "autoApply", delegateTask.getId()); taskService.complete(delegateTask.getId(), delegateTask.getVariables()); return; }