diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java index 568870c2..5a312946 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java @@ -8,6 +8,7 @@ import java.io.Serializable; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -84,18 +85,21 @@ public class LawsEvaluationNotMetLibrary implements Serializable { * 车型状态 */ @ApiModelProperty(value = "车型状态") + @Dict(dicCode = "model_status") private String modelStatus; /** * 责任部门 */ @ApiModelProperty(value = "责任部门") + @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") private String authDept; /** * 评估人 */ @ApiModelProperty(value = "评估人") + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") private String userId; /** @@ -156,6 +160,7 @@ public class LawsEvaluationNotMetLibrary implements Serializable { * 整改状态 */ @ApiModelProperty(value = "整改状态") + @Dict(dicCode = "rectify_status") private String rectifyStatus; /** @@ -168,12 +173,14 @@ public class LawsEvaluationNotMetLibrary implements Serializable { * 问题类型 */ @ApiModelProperty(value = "问题类型") + @Dict(dicCode = "problem_type") private String problemType; /** * 整改周期 */ @ApiModelProperty(value = "整改周期") + @Dict(dicCode = "correction_period") private String correctionPeriod; /** @@ -188,6 +195,7 @@ public class LawsEvaluationNotMetLibrary implements Serializable { * 附件 */ @ApiModelProperty(value = "附件") + @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name") private String file; /** diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java index a582bd0b..fecdcd43 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java @@ -39,7 +39,7 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl