From d559ff292db63840d693d67587f5b31933edf851 Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Fri, 17 Mar 2023 14:22:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE=20=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E3=80=81=E9=AA=8C=E8=AF=81=E7=AC=A6=E5=90=88=E6=80=A7?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81=E5=A4=84=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/project/entity/ProjectLawsInventoryEO.java |  4 ++++
 .../impl/ProjectLawsInventoryEOServiceImpl.java        | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
index 4419ea728..def122c18 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
@@ -487,8 +487,12 @@ public class ProjectLawsInventoryEO implements Serializable {
     /**设计符合性确认-流程状态*/
     @ApiModelProperty(value = "设计符合性确认-流程状态")
     private String designFlowStatus;
+    @TableField(exist = false)
+    private String designFlowStatusName;
 
     /**验证符合性确认-流程状态*/
     @ApiModelProperty(value = "验证符合性确认-流程状态")
     private String verifyFlowStatus;
+    @TableField(exist = false)
+    private String verifyFlowStatusName;
 }
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 c0ea2547e..7cec62dd9 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
@@ -1665,6 +1665,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						}
 					}
 				}
+				
+				// 处理符合性流程状态。
+				if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignFlowStatus())){
+					String designFlowStatusName = ComplianceFlowStatusEnum.getTextByValue(projectLawsInventoryEO.getDesignFlowStatus(), cut);
+					projectLawsInventoryEO.setDesignFlowStatusName(designFlowStatusName);
+				}
+				if(StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyFlowStatus())){
+					String verifyFlowStatusName = ComplianceFlowStatusEnum.getTextByValue(projectLawsInventoryEO.getVerifyFlowStatus(), cut);
+					projectLawsInventoryEO.setVerifyFlowStatusName(verifyFlowStatusName);
+				}
 			}
 		}
 	}