From d23bee38436a492eb0569890fa7f2ba2fa718ee9 Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Tue, 7 Nov 2023 09:21:32 +0800
Subject: [PATCH] =?UTF-8?q?fix=2078182=20=E4=BC=81=E4=B8=9A=E6=A0=87?=
 =?UTF-8?q?=E5=87=86-=E6=A0=87=E5=87=86=E7=8A=B6=E6=80=81=20=E5=B0=81?=
 =?UTF-8?q?=E5=AD=98=E7=8A=B6=E6=80=81=E6=8E=92=E5=BA=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/laws/common/service/impl/LawsCommonServiceImpl.java | 2 +-
 .../modules/laws/standard/entity/LawsEnterpriseStandard.java    | 2 +-
 .../service/impl/LawsEnterpriseStandardServiceImpl.java         | 2 +-
 .../service/impl/LawsStandardCollectionServiceImpl.java         | 2 +-
 .../modules/standard/enterprise/LawsEnterpriseStandardTest.java | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
index 1fcf73f6..2ca8d84e 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
@@ -2030,7 +2030,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
         lawsOverseasStandardService.update(fbUpdateWrapper);
         // 企标
         LambdaUpdateWrapper<LawsEnterpriseStandard> qbUpdateWrapper = new LambdaUpdateWrapper<>();
-        qbUpdateWrapper.set(LawsEnterpriseStandard::getStandardState, 9);
+        qbUpdateWrapper.set(LawsEnterpriseStandard::getStandardState, "9");
         qbUpdateWrapper.in(LawsEnterpriseStandard::getStandardNumber, standardNumbers);
         lawsEnterpriseStandardService.update(qbUpdateWrapper);
     }
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 7e30f4d6..52707893 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
@@ -154,7 +154,7 @@ public class LawsEnterpriseStandard implements Serializable {
      */
     @Dict(dicCode = "es_status")
     @ApiModelProperty(value = "标准状态")
-    private Integer standardState;
+    private String standardState;
 
     /**
      * 企标体系
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
index 33013f9f..383e95a7 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
@@ -278,7 +278,7 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
             es.setReleaseDate(dto.getFbrq());
             es.setImplementationDate(dto.getSsrq());
             String standardState = dto.getBzzt();
-            es.setStandardState(standardState.equals("现行有效") ? 8 : 9);
+            es.setStandardState(standardState.equals("现行有效") ? "8" : "9");
             // 代替被代替特殊逻辑
             es.setSubstituteStandardNumber(dto.getTdbzh());
             es.setReplacedByStandardNumber(dto.getBtdbzh());
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 fa9733cc..2fed7859 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", String.valueOf(standard.getStandardState()));
+					String standard_state = sysDictService.queryDictTextByKey("es_status", standard.getStandardState());
 					collection.setStandardState(standard_state);
 				}
 			}
diff --git a/laws-single-startup/src/test/java/com/jero/modules/standard/enterprise/LawsEnterpriseStandardTest.java b/laws-single-startup/src/test/java/com/jero/modules/standard/enterprise/LawsEnterpriseStandardTest.java
index 21f25d45..47532192 100644
--- a/laws-single-startup/src/test/java/com/jero/modules/standard/enterprise/LawsEnterpriseStandardTest.java
+++ b/laws-single-startup/src/test/java/com/jero/modules/standard/enterprise/LawsEnterpriseStandardTest.java
@@ -64,7 +64,7 @@ public class LawsEnterpriseStandardTest {
         lawsEnterpriseStandard.setEnglishName(faker.commerce().productName());
         lawsEnterpriseStandard.setReleaseDate(faker.date().past(1, TimeUnit.SECONDS));
         lawsEnterpriseStandard.setImplementationDate(faker.date().past(1, TimeUnit.SECONDS));
-        lawsEnterpriseStandard.setStandardState(faker.random().nextInt(5));
+        lawsEnterpriseStandard.setStandardState(faker.random().nextInt(5) + "");
 
         return lawsEnterpriseStandard;
     }