From df2101cdfd5d7b89a650e0ac9490fe7cace93f97 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 21 Sep 2023 20:44:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=B5=81=E7=A8=8B=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=EF=BC=88=E5=B9=B3=E5=8F=B0=E4=BB=B6=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...PhoneProjectLawsInventoryEOController.java | 13 +-----
 .../ProjectLawsInventoryEOController.java     | 12 +++++
 .../modules/project/enums/FlowFlagEnum.java   | 45 +++++++++++++++++++
 .../ProjectLawsInventoryEOServiceImpl.java    |  4 +-
 4 files changed, 60 insertions(+), 14 deletions(-)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowFlagEnum.java

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/PhoneProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/PhoneProjectLawsInventoryEOController.java
index 2f178b654..3506c9e7a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/PhoneProjectLawsInventoryEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/PhoneProjectLawsInventoryEOController.java
@@ -562,16 +562,5 @@ public class PhoneProjectLawsInventoryEOController extends JeroController<Projec
 		return this.projectLawsInventoryEOService.finalizationVerify(params);
 	}
 
-	/**
-	 * 点击流程状态查看流程详情（平台件）
-	 *
-	 * @return
-	 */
-	@AutoLog(value = "点击流程状态查看流程详情（平台件）")
-	@ApiOperation(value="点击流程状态查看流程详情（平台件）", notes="点击流程状态查看流程详情（平台件）")
-	@GetMapping(value = "/queryPlatformList")
-	public Result<List<ProjectLawsInventoryEO>> queryPlatformList(String lawsInventoryId,String flowFlag,String cut) {
-		List<ProjectLawsInventoryEO> list = projectLawsInventoryEOService.queryPlatformList(lawsInventoryId,flowFlag,cut);
-		return Result.OK(list);
-	}
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java
index 66ab3f348..e96cef2cc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java
@@ -575,4 +575,16 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
 	public Result<?> finalizationVerify(@RequestParam Map<String,Object> params){
 		return this.projectLawsInventoryEOService.finalizationVerify(params);
 	}
+	/**
+	 * 点击流程状态查看流程详情（平台件）
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "点击流程状态查看流程详情（平台件）")
+	@ApiOperation(value="点击流程状态查看流程详情（平台件）", notes="点击流程状态查看流程详情（平台件）")
+	@GetMapping(value = "/queryPlatformList")
+	public Result<List<ProjectLawsInventoryEO>> queryPlatformList(String lawsInventoryId,String flowFlag,String cut) {
+		List<ProjectLawsInventoryEO> list = projectLawsInventoryEOService.queryPlatformList(lawsInventoryId,flowFlag,cut);
+		return Result.OK(list);
+	}
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowFlagEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowFlagEnum.java
new file mode 100644
index 000000000..06ffd9ad3
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowFlagEnum.java
@@ -0,0 +1,45 @@
+package com.jero.modules.project.enums;
+
+/**
+ * 任务状态枚举类
+ */
+public enum FlowFlagEnum {
+    DESIGN("设计符合性流程状态","design"),
+    VERIFY("验证符合性流程状态","verify"),
+    ;
+
+
+    String name;
+    String value;
+
+    private FlowFlagEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public static String getTextByValue(String value) {
+        FlowFlagEnum[] values = values();
+        for (FlowFlagEnum taskStatusEnum : values) {
+            if (taskStatusEnum.value.equals(value)) {
+                return taskStatusEnum.name;
+            }
+        }
+        return null;
+    }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 70d4fdedd..ec500c9ff 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -12227,9 +12227,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOList) {
 				//流程状态
 				String flowStatus = "";
-				if("design".equals(flowFlag)){
+				if(FlowFlagEnum.DESIGN.getValue().equals(flowFlag)){//流程标识，点击设计符合性流程状态跳转
 					flowStatus = projectLawsInventoryEO.getDesignFlowStatus();
-				}else{
+				}else if(FlowFlagEnum.VERIFY.getValue().equals(flowFlag)){//流程标识，点击验证符合性流程状态跳转
 					flowStatus = projectLawsInventoryEO.getVerifyFlowStatus();
 				}
 				if (StringUtils.isNotEmpty(flowStatus)) {