From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X

---
 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java
index 7b2f55c..d18ebb0 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java
@@ -3,9 +3,10 @@
 import cn.hutool.core.util.StrUtil;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import org.apache.commons.lang3.StringUtils;
 
 import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 浠诲姟鐘舵�佹灇涓�
@@ -15,50 +16,62 @@
 @Getter
 @AllArgsConstructor
 public enum TaskStatusEnum {
+
     /**
      * 鎾ら攢
      */
     CANCEL("cancel", "鎾ら攢"),
+
     /**
      * 閫氳繃
      */
     PASS("pass", "閫氳繃"),
+
     /**
      * 寰呭鏍�
      */
     WAITING("waiting", "寰呭鏍�"),
+
     /**
      * 浣滃簾
      */
     INVALID("invalid", "浣滃簾"),
+
     /**
      * 閫�鍥�
      */
     BACK("back", "閫�鍥�"),
+
     /**
      * 缁堟
      */
     TERMINATION("termination", "缁堟"),
+
     /**
      * 杞姙
      */
     TRANSFER("transfer", "杞姙"),
+
     /**
      * 濮旀墭
      */
-    PENDING("pending", "濮旀墭"),
+    DEPUTE("depute", "濮旀墭"),
+
     /**
      * 鎶勯��
      */
     COPY("copy", "鎶勯��"),
+
     /**
      * 鍔犵
      */
     SIGN("sign", "鍔犵"),
+
     /**
      * 鍑忕
      */
     SIGN_OFF("sign_off", "鍑忕"),
+
     /**
      * 瓒呮椂
      */
@@ -74,21 +87,18 @@
      */
     private final String desc;
 
+    private static final Map<String, String> STATUS_DESC_MAP = Arrays.stream(values())
+        .collect(Collectors.toConcurrentMap(TaskStatusEnum::getStatus, TaskStatusEnum::getDesc));
+
     /**
      * 浠诲姟涓氬姟鐘舵��
      *
      * @param status 鐘舵��
      */
     public static String findByStatus(String status) {
-        if (StringUtils.isBlank(status)) {
-            return StrUtil.EMPTY;
-        }
-
-        return Arrays.stream(TaskStatusEnum.values())
-            .filter(statusEnum -> statusEnum.getStatus().equals(status))
-            .findFirst()
-            .map(TaskStatusEnum::getDesc)
-            .orElse(StrUtil.EMPTY);
+        // 浠庣紦瀛樹腑鐩存帴鑾峰彇鎻忚堪
+        return STATUS_DESC_MAP.getOrDefault(status, StrUtil.EMPTY);
     }
+
 }
 

--
Gitblit v1.9.3