From 8d4944cbd137670d2df4c3b05ba2ecda08e52395 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 29 Dec 2023 17:47:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=B3=BB=E7=BB=9F=E4=B8=AD=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8E=E4=BC=81=E6=A0=87=E6=A0=87=E5=87=86=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8Key=E8=AF=AF=E7=94=A8Bug=E7=9A=84=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/laws/common/vo/ManyStandardSelectionBox.java   | 2 +-
 .../modules/laws/standard/entity/LawsEnterpriseStandard.java    | 2 +-
 .../jero/modules/personal/entity/LawsStandardCollection.java    | 2 +-
 .../service/impl/LawsStandardCollectionServiceImpl.java         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java b/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java
index b290bd78..aa022769 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java
@@ -35,7 +35,7 @@ public class ManyStandardSelectionBox {
     @Dict(dicCode = "standard_state")
     private java.lang.String standardState;
     @ApiModelProperty(value = "企标标准状态")
-    @Dict(dicCode = "es_status")
+    @Dict(dicCode = "enterprise_standard_state")
     private java.lang.String esStandardState;
 
     public void setStandardState(String standardState) {
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java
index 34dae0b8..89db071c 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java
@@ -152,7 +152,7 @@ public class LawsEnterpriseStandard implements Serializable {
     /**
      * 标准状态
      */
-    @Dict(dicCode = "es_status")
+    @Dict(dicCode = "enterprise_standard_state")
     @ApiModelProperty(value = "标准状态")
     private String standardState;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardCollection.java b/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardCollection.java
index a65a46ee..8f05ff7d 100644
--- a/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardCollection.java
+++ b/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardCollection.java
@@ -110,7 +110,7 @@ public class LawsStandardCollection implements Serializable {
     private String onTheProductionDate;
 
     /**标准状态*/
-    @Dict(dicCode = "es_status")
+    @Dict(dicCode = "enterprise_standard_state")
 //    @Dict(dicCode = "standard_state")
     @TableField(exist = false)
     @ApiModelProperty(value = "标准状态")
diff --git a/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardCollectionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardCollectionServiceImpl.java
index 2fed7859..3cc3f968 100644
--- a/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardCollectionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardCollectionServiceImpl.java
@@ -95,7 +95,7 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
 				LawsEnterpriseStandard standard = ILawsEnterpriseStandardService.getById(standardId);
 				if (standard != null){
 					collection.setReleaseDate(standard.getReleaseDate());
-					String standard_state = sysDictService.queryDictTextByKey("es_status", standard.getStandardState());
+					String standard_state = sysDictService.queryDictTextByKey("enterprise_standard_state", standard.getStandardState());
 					collection.setStandardState(standard_state);
 				}
 			}