From 7442eb67a45466b020176ba234386dcd9dc5bc27 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Sat, 7 Oct 2023 11:38:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20-=20=E5=AE=8C=E5=96=84=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=8A=82=E7=82=B9=E8=81=9A=E5=90=88=E5=90=8E=E7=9A=84?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../axzo/workflow/core/service/impl/BpmnTaskServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnTaskServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnTaskServiceImpl.java index d2c3f7195..a4f47ea95 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnTaskServiceImpl.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnTaskServiceImpl.java @@ -404,10 +404,13 @@ public class BpmnTaskServiceImpl implements BpmnTaskService { groupVO.setProcessInstanceId(processInstanceId); groupVO.setTaskDefinitionKey(entry.getKey()); if (CollectionUtils.isEmpty(entry.getValue())) { + // 没有审批人 groupVO.setResult(PROCESSING); } else if (entry.getValue().size() == 1) { + // 单人审批 groupVO.setResult(entry.getValue().get(0).getResult()); } else { + // 多人审批 if (entry.getValue().stream().allMatch(i -> Objects.equals(APPROVED, i.getResult()))) { groupVO.setResult(APPROVED); } else if (entry.getValue().stream().anyMatch(i -> Objects.equals(PROCESSING, i.getResult()))) { From 5ebe156933603ff1f922e10743d8676e2488bcde Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Sat, 7 Oct 2023 13:41:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20-=20=E4=BF=AE=E6=94=B9=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=86=85=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/RocketMqBpmProcessEventListener.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/RocketMqBpmProcessEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/RocketMqBpmProcessEventListener.java index e38326645..ad1e79d06 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/RocketMqBpmProcessEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/RocketMqBpmProcessEventListener.java @@ -53,7 +53,8 @@ public class RocketMqBpmProcessEventListener implements BpmProcessEventListener .setProcessDefinitionId(event.getProcessDefinitionId()) .setProcessDefinitionKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey()) .setProcessDefinitionVersion(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionVersion()) - .setInitiator(((FlowableProcessCancelledEventImpl) event).getExecution().getVariable(INTERNAL_INITIATOR, BpmnTaskDelegateAssigner.class)) + .setInitiator(((ExecutionEntityImpl) event.getEntity()).getVariable(INTERNAL_INITIATOR, + BpmnTaskDelegateAssigner.class)) .setVariables(((ExecutionEntityImpl) event.getEntity()).getVariables()) .setStartTime(((ExecutionEntityImpl) event.getEntity()).getStartTime()) .setTenantId(((ExecutionEntityImpl) event.getEntity()).getTenantId()) @@ -86,7 +87,8 @@ public class RocketMqBpmProcessEventListener implements BpmProcessEventListener .setProcessDefinitionId(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionId()) .setProcessDefinitionKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey()) .setProcessDefinitionVersion(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionVersion()) - .setInitiator(((FlowableProcessCancelledEventImpl) event).getExecution().getVariable(INTERNAL_INITIATOR, BpmnTaskDelegateAssigner.class)) + .setInitiator(((ExecutionEntityImpl) event.getEntity()).getVariable(INTERNAL_INITIATOR, + BpmnTaskDelegateAssigner.class)) .setVariables(((ExecutionEntityImpl) event.getEntity()).getVariables()) .setStartTime(((ExecutionEntityImpl) event.getEntity()).getStartTime()) .setTenantId(((ExecutionEntityImpl) event.getEntity()).getTenantId()) @@ -192,8 +194,8 @@ public class RocketMqBpmProcessEventListener implements BpmProcessEventListener .setProcessDefinitionId(event.getProcessDefinitionId()) .setProcessDefinitionKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey()) .setProcessDefinitionVersion(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionVersion()) - .setVariables(((FlowableProcessCancelledEventImpl) event).getExecution().getVariables()) .setInitiator(((FlowableProcessCancelledEventImpl) event).getExecution().getVariable(INTERNAL_INITIATOR, BpmnTaskDelegateAssigner.class)) + .setVariables(((FlowableProcessCancelledEventImpl) event).getExecution().getVariables()) .setStartTime(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getStartTime()) .setTenantId(((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId()) .setBusinessKey(((FlowableProcessCancelledEventImpl) event).getExecution().getProcessInstanceBusinessKey())