diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java index 128b5ee7..3a4b47be 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java @@ -74,7 +74,6 @@ public class LawsAssess implements Serializable { /**发布日期*/ @TableField(exist = false) - @Excel(name = "发布日期", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "发布日期") @@ -122,7 +121,6 @@ public class LawsAssess implements Serializable { private String sarFileSplitInfoId; @TableField(exist = false) - @Excel(name = "责任部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id", exportConvert = true) @ApiModelProperty(value = "责任部门") @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") private String responsibleDepartment; @@ -155,6 +153,10 @@ public class LawsAssess implements Serializable { @ApiModelProperty(value = "删除状态(0-正常,1-删除)") private String delFlag; + @TableField(exist = false) + @ApiModelProperty(value = "标准编号或名称") + private String standardNumberOrName; + public String convertgetStandardEnglishName(){ return StringUtils.isNotBlank(this.standardEnglishName) ? this.standardEnglishName : "-"; } @@ -170,4 +172,7 @@ public class LawsAssess implements Serializable { public String convertgetResponsibleDepartment(){ return StringUtils.isNotBlank(this.responsibleDepartment) ? this.responsibleDepartment : "-"; } + public String convertgetAssessResults(){ + return StringUtils.isNotBlank(this.assessResults) ? this.assessResults : "-"; + } } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java index c45573af..44c9adff 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java @@ -194,6 +194,10 @@ public class LawsAssessServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>();