From 42a7552b9c8603aeab7f0785eb05270dfbeb0bd3 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期日, 02 三月 2025 10:16:20 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
common/src/main/java/com/ycl/common/enums/business/ProjectCategoryEnum.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/common/src/main/java/com/ycl/common/enums/business/ProjectCategoryEnum.java b/common/src/main/java/com/ycl/common/enums/business/ProjectCategoryEnum.java
index f152d46..94bfd53 100644
--- a/common/src/main/java/com/ycl/common/enums/business/ProjectCategoryEnum.java
+++ b/common/src/main/java/com/ycl/common/enums/business/ProjectCategoryEnum.java
@@ -8,10 +8,10 @@
@AllArgsConstructor
public enum ProjectCategoryEnum {
- RESERVE("1", "pendding", "鍌ㄥ椤圭洰","reserve","鍌ㄥ瑙勫垝闃舵"),
- PREVIOUS("2", "pendding","鍓嶆湡椤圭洰","previous","椤圭洰鍓嶆湡闃舵"),
+ RESERVE("1", "pendding", "鍌ㄥ椤圭洰","reserve","鍌ㄥ闃舵"),
+ PREVIOUS("2", "pendding","鍓嶆湡椤圭洰","previous","鍓嶆湡闃舵"),
IMPLEMENT("3", "working,stop","瀹炴柦椤圭洰","implement","瀹炴柦闃舵"),
- FINISH("4", "finish","绔ｅ伐椤圭洰","finish","绔ｅ伐鎶曠敤闃舵"),
+ FINISH("4", "finish","绔ｅ伐椤圭洰","finish","绔ｅ伐闃舵"),
EXCEPTION("5", "","寮傚父椤圭洰","exception","");
@@ -19,7 +19,7 @@
private final String status;
private final String name;
private final String code;
- private final String desc;
+ private final String desc;
//鍒ゆ柇浼犲叆鏁版嵁鏄惁瀛樺湪鍥涚椤圭洰鎺ㄨ繘鐘舵��
public static boolean isValidType(String type) {
@@ -33,16 +33,12 @@
/**
* 鑾峰彇椤圭洰闃舵
- * @param projectStatus
- * @param hasProcess 鏄惁鍚姩娴佺▼
+ * @param projectPhase
* @return
*/
- public static String getPhaseByProjectStatus(String projectStatus, boolean hasProcess) {
+ public static String getPhaseByProjectStatus(String projectPhase) {
for (ProjectCategoryEnum projectCategoryEnum : ProjectCategoryEnum.values()) {
- if (hasProcess && PREVIOUS.status.contains(projectStatus)) {
- return PREVIOUS.desc;
- }
- if (projectCategoryEnum.status.contains(projectStatus)) {
+ if (projectCategoryEnum.type.equals(projectPhase)) {
return projectCategoryEnum.desc;
}
}
--
Gitblit v1.8.0