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