From f1eeb1b247f0cab5c267d4cbad77d605784ad026 Mon Sep 17 00:00:00 2001
From: caozhen <18736171426@139.com>
Date: Tue, 12 Sep 2023 16:16:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93byid=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=B3=A8=E8=A7=A3=E5=AD=97=E5=85=B8=E7=BF=BB=E8=AF=91?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8switch=E6=89=8B=E5=8A=A8=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/LawsProjectLibrary.java            |  5 +++-
 .../impl/LawsProjectLibraryServiceImpl.java   | 30 ++++++++++++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsProjectLibrary.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsProjectLibrary.java
index 1d473abb..6d9a9251 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsProjectLibrary.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsProjectLibrary.java
@@ -11,7 +11,6 @@ import com.jero.common.aspect.annotation.Dict;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
@@ -43,6 +42,8 @@ public class LawsProjectLibrary implements Serializable {
     @Dict(dicCode = "project_source")
     @ApiModelProperty(value = "项目来源(1-本地新增、2-PMS)")
     private String projectSource;
+    @TableField(exist = false)
+    private String projectSource_dictText;
 
 	/**项目名称*/
     @NotBlank(message = "projectName not null")
@@ -61,6 +62,8 @@ public class LawsProjectLibrary implements Serializable {
     @Dict(dicCode = "project_health")
     @ApiModelProperty(value = "项目健康度(1-预警、2-风险、3-正常)")
     private String projectHealth;
+    @TableField(exist = false)
+    private String projectHealth_dictText;
 
     /**创建人*/
     @ApiModelProperty(value = "创建人")
diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsProjectLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsProjectLibraryServiceImpl.java
index e4a8a8f9..622071e8 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsProjectLibraryServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsProjectLibraryServiceImpl.java
@@ -1,6 +1,5 @@
 package com.jero.modules.projectLibrary.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.jero.modules.projectLibrary.entity.LawsProjectLibrary;
@@ -110,10 +109,39 @@ public class LawsProjectLibraryServiceImpl extends ServiceImpl<LawsProjectLibrar
     public LawsProjectLibrary queryById(String id) {
 		LawsProjectLibrary library = getById(id);
 		String projectLeader = library.getProjectLeader();
+		String projectSource = library.getProjectSource();
+		String projectHealth = library.getProjectHealth();
 		if (StringUtils.isNotBlank(projectLeader)){
 			SysUser user = sysUserService.getById(projectLeader);
 			library.setNameWorkNo(user.getNameWorkNo());
 		}
+		if (StringUtils.isNotBlank(projectSource)){
+			switch (projectSource) {
+				case "1":
+					library.setProjectSource_dictText("本地新增");
+					break;
+				case "2":
+					library.setProjectSource_dictText("PMS");
+					break;
+				default:
+					library.setProjectSource_dictText("");
+			}
+		}
+		if (StringUtils.isNotBlank(projectHealth)){
+			switch (projectHealth) {
+				case "1":
+					library.setProjectHealth_dictText("预警");
+					break;
+				case "2":
+					library.setProjectHealth_dictText("风险");
+					break;
+				case "3":
+					library.setProjectHealth_dictText("正常");
+					break;
+				default:
+					library.setProjectHealth_dictText("");
+			}
+		}
         return library;
     }
 }