From 71792d7fc55cd8b0287cc6bb30aa77b4cfe07315 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 31 Jan 2024 11:25:02 +0800
Subject: [PATCH] =?UTF-8?q?fix=2079847=20=E8=BD=A6=E5=9E=8B=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E8=AF=A6=E6=83=85-=E5=AF=BC=E5=87=BA=20?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E9=9C=80=E8=A6=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/projectLibrary/entity/LawsAssess.java   | 9 +++++++--
 .../service/impl/LawsAssessServiceImpl.java              | 4 ++++
 2 files changed, 11 insertions(+), 2 deletions(-)

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<LawsAssessMapper, LawsAss
 				//assess.setAssessResults("-");
 				assess.setResponsibleDepartment(standard.getResponsibleDepartment());
 			}
+			String assessResults = assess.getAssessResults();
+			if (StringUtils.isBlank(assessResults)){
+				assess.setAssessResults("-");
+			}
 
 			// 查询标准拆分表
 			LambdaQueryWrapper<SarFileSplitInfoEO> queryWrapper = new LambdaQueryWrapper<>();