From 574cd6f4ad6269af9fb170e81aef8ea0cd44eede Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 23 Jan 2024 10:35:14 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=B8=93=E9=A1=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93=20=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessProjectStandardController.java     |  1 -
 .../entity/LawsSpecialProjectLibrary.java     | 19 ++++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java
index 8e53da3d..350ff512 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java
@@ -162,7 +162,6 @@ public class ProcessProjectStandardController extends JeroController<ProcessProj
      * 法规合规评估流程-查询立项结果列表
      * @return
      */
-    @DictPoint
     @AutoLog(value = "法规合规评估流程-查询评估列表")
     @ApiOperation(value = "查询评估列表")
     @GetMapping("/getTermUserList")
diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsSpecialProjectLibrary.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsSpecialProjectLibrary.java
index 1e6a1136..1143cc63 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsSpecialProjectLibrary.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsSpecialProjectLibrary.java
@@ -51,11 +51,11 @@ public class LawsSpecialProjectLibrary implements Serializable {
     @ApiModelProperty(value = "更新日期")
     private Date updateTime;
 	/**所属部门*/
-	@Excel(name = "所属部门", width = 15)
     @ApiModelProperty(value = "所属部门")
     private String orgCode;
 	/**来源(1-国内、2-海外)*/
-	@Excel(name = "来源(1-国内、2-海外)", width = 15)
+	@Excel(name = "来源", width = 15, dicCode = "standard_source")
+    @Dict(dicCode = "standard_source")
     @ApiModelProperty(value = "来源(1-国内、2-海外)")
     private String source;
 	/**标准编号*/
@@ -67,7 +67,6 @@ public class LawsSpecialProjectLibrary implements Serializable {
     @ApiModelProperty(value = "标准名称")
     private String standardName;
 	/**标准ID*/
-	@Excel(name = "标准ID", width = 15)
     @ApiModelProperty(value = "标准ID")
     private String standardId;
 	/**条款号*/
@@ -79,11 +78,11 @@ public class LawsSpecialProjectLibrary implements Serializable {
     @ApiModelProperty(value = "条款名称")
     private String termName;
 	/**标准类型(1-国内、2-海外、3-企标)*/
-	@Excel(name = "标准类型(1-国内、2-海外、3-企标)", width = 15)
     @ApiModelProperty(value = "标准类型(1-国内、2-海外、3-企标)")
     private String standardType;
 	/**标准状态(1-草案、2-征求意见稿、3-送审稿、4-报批稿、5-发布稿、5-修改单)*/
-	@Excel(name = "标准状态(1-草案、2-征求意见稿、3-送审稿、4-报批稿、5-发布稿、5-修改单)", width = 15)
+    @Dict(dicCode = "enterprise_standard_state")
+	@Excel(name = "标准状态", width = 15, dicCode = "enterprise_standard_state")
     @ApiModelProperty(value = "标准状态(1-草案、2-征求意见稿、3-送审稿、4-报批稿、5-发布稿、5-修改单)")
     private String standardState;
 	/**车型系列*/
@@ -92,12 +91,13 @@ public class LawsSpecialProjectLibrary implements Serializable {
     @ApiModelProperty(value = "车型系列")
     private String modelSeries;
 	/**合规评估结果*/
-	@Excel(name = "合规评估结果", width = 15)
+    @Dict(dicCode = "assess_results")
+	@Excel(name = "合规评估结果", width = 15, dicCode = "assess_results")
     @ApiModelProperty(value = "合规评估结果")
     private String result;
 	/**问题描述*/
-	@Excel(name = "问题描述", width = 15)
-    @ApiModelProperty(value = "问题描述")
+	@Excel(name = "依据描述", width = 15)
+    @ApiModelProperty(value = "依据描述")
     private String description;
 	/**佐证材料*/
 	@Excel(name = "佐证材料", width = 15)
@@ -110,7 +110,8 @@ public class LawsSpecialProjectLibrary implements Serializable {
     @ApiModelProperty(value = "评估日期")
     private Date valuationTime;
 	/**是否立项*/
-	@Excel(name = "是否立项", width = 15)
+    @Dict(dicCode = "yn")
+	@Excel(name = "是否立项", width = 15, dicCode = "yn")
     @ApiModelProperty(value = "是否立项")
     private String projectApproval;
 	/**工作令编号*/