From 8f9c8e46d12f5bc06dd2b95ba9301bd59b2e3b2a Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 4 Jul 2024 18:00:06 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=20=E5=85=B6=E4=BB=96=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E5=88=86=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/project/common/PayProjectCommon.java |  4 ++
 .../PayWorkingGroupDataFileController.java    | 16 ++----
 .../jero/project/enums/ProjectTypeEnum.java   | 53 +++++++++++++++++++
 3 files changed, 61 insertions(+), 12 deletions(-)
 create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/enums/ProjectTypeEnum.java

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java
index ce7ab5f8..bc777d53 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java
@@ -113,6 +113,10 @@ public class PayProjectCommon {
      * 项目类型1:工作组，2：分标委, 3:理事会, 4：起草组
      */
     public final static Integer PROJECT_TYPE_FILE4 = 4;
+    /**
+     * 5功能安全中心
+     */
+    public final static Integer PROJECT_TYPE_FILE5 = 5;
     /**
      * 需要发票（1：增值税普通发票，2：增值税专用发票，0：否，3：需要发票（小程序需要））
      */
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java
index 9714c766..de0951b1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java
@@ -18,6 +18,7 @@ import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.project.common.PayProjectCommon;
 import com.jero.project.entity.PayWorkingGroup;
 import com.jero.project.entity.PayWorkingGroupDataFile;
+import com.jero.project.enums.ProjectTypeEnum;
 import com.jero.project.service.IPayWorkingGroupDataFileService;
 import com.jero.project.service.IPayWorkingGroupService;
 import io.swagger.annotations.Api;
@@ -86,10 +87,7 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
 		if(StringUtils.isBlank(payWorkingGroupDataFile.getProjectId())){
 			return Result.error("工作组id不能为空！");
 		}
-		if(!Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1)
-			&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2)
-				&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE3)
-				&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE4)){
+		if(!ProjectTypeEnum.hasValue(payWorkingGroupDataFile.getProjectType())){
 			return Result.error("项目状态不正确！");
 		}
 
@@ -142,10 +140,7 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
 		if(StringUtils.isBlank(payWorkingGroupDataFile.getProjectId())){
 			return Result.error("项目id不能为空!");
 		}
-		if(!Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1)
-				&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2)
-				&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE3)
-				&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE4)){
+		if(!ProjectTypeEnum.hasValue(payWorkingGroupDataFile.getProjectType())){
 			return Result.error("项目状态不正确！");
 		}
 		if(StringUtils.isBlank(payWorkingGroupDataFile.getFileIds())){
@@ -332,10 +327,7 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
 		if(StringUtils.isBlank(payWorkingGroupDataFile.getProjectId())){
 			throw new JeroBootException("项目id不能为空!");
 		}
-		if(!Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1)
-				&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2)
-				&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE3)
-				&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE4)){
+		if(!ProjectTypeEnum.hasValue(payWorkingGroupDataFile.getProjectType())){
 			throw new JeroBootException("项目状态不正确！");
 		}
 		if(Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1)){
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/enums/ProjectTypeEnum.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/enums/ProjectTypeEnum.java
new file mode 100644
index 00000000..a9c806d9
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/enums/ProjectTypeEnum.java
@@ -0,0 +1,53 @@
+package com.jero.project.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author liJiaRao
+ * @date 2024-07-04 17:54
+ */
+@Getter
+@AllArgsConstructor
+public enum ProjectTypeEnum {
+    /**
+     * A
+     */
+    ONE("工作组", 1),
+    TWO("分标委", 2),
+    THREE("理事会", 3),
+    FOUR("起草组", 4),
+    FIVE("功能安全中心", 5),
+    ;
+
+    private String name;
+    private Integer value;
+
+    public static String getNameByValue(Integer value) {
+        for (ProjectTypeEnum enumObject : values()) {
+            if (enumObject.getValue().equals(value)) {
+                return enumObject.getName();
+            }
+        }
+        return null;
+    }
+
+    public static Integer getValueByName(String name) {
+        for (ProjectTypeEnum enumObject : values()) {
+            if (enumObject.getName().equals(name)) {
+                return enumObject.getValue();
+            }
+        }
+        return null;
+    }
+    public static boolean hasValue(Integer value) {
+        for (ProjectTypeEnum enumObject : values()) {
+            if (enumObject.getValue().equals(value)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+}