From 6fe9470cea3d8285f606493df7b579bdf33bbb9c Mon Sep 17 00:00:00 2001 From: yangqicheng Date: Wed, 11 Sep 2024 16:10:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REQ-2924-=E6=B7=BB=E5=8A=A0=E6=A0=B9?= =?UTF-8?q?=E6=8D=AEtype=E8=8E=B7=E5=8F=96=E6=9E=9A=E4=B8=BE=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/common/enums/BpmnFlowNodeType.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnFlowNodeType.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnFlowNodeType.java index 1dc7eb85d..1856447f6 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnFlowNodeType.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnFlowNodeType.java @@ -1,6 +1,8 @@ package cn.axzo.workflow.common.enums; +import org.springframework.util.StringUtils; + import java.util.Arrays; import java.util.Objects; @@ -51,6 +53,19 @@ public enum BpmnFlowNodeType { this.desc = desc; } + public static BpmnFlowNodeType getByType(String type) { + if (!StringUtils.hasText(type)) { + return null; + } + BpmnFlowNodeType[] values = BpmnFlowNodeType.values(); + for (BpmnFlowNodeType value : values) { + if (value.getType().equals(type)) { + return value; + } + } + return null; + } + public static BpmnFlowNodeType valueOfType(String type) { return Arrays.stream(BpmnFlowNodeType.values()) .filter(i -> Objects.equals(i.getType(), type)) From 5ccd66c6d5c27b278cf3911da62c3922b10f26a7 Mon Sep 17 00:00:00 2001 From: yangqicheng Date: Wed, 11 Sep 2024 17:55:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REQ-2924-=E8=8E=B7=E5=8F=96=E9=80=80?= =?UTF-8?q?=E5=9B=9E=E8=8A=82=E7=82=B9=E5=88=97=E8=A1=A8=EF=BC=8C=E5=80=92?= =?UTF-8?q?=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/core/service/impl/BpmnProcessTaskServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java index ac3080ea7..896bcbc0f 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java @@ -411,6 +411,7 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService { BpmnOptionalNodeDTO bpmnOptionalNodeDTO = resultList.get(resultList.size() - 1); bpmnOptionalNodeDTO.setProcessNodeDesc(bpmnOptionalNodeDTO.getProcessActivityName() + "(上一级)"); } + resultList.sort((o1, o2) -> o2.getOrdinal() - o1.getOrdinal()); return resultList; }