From 0c3f082071af95b5a413e7a105c2e0c354023371 Mon Sep 17 00:00:00 2001
From: caozhen <18736171426@139.com>
Date: Thu, 21 Sep 2023 15:15:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=88=97=E8=A1=A8=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86=E6=A0=87=E5=87=86=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsStandardCollectionServiceImpl.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

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 e3bda534..fa9733cc 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
@@ -13,6 +13,7 @@ import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
 import com.jero.modules.personal.entity.LawsStandardCollection;
 import com.jero.modules.personal.mapper.LawsStandardCollectionMapper;
 import com.jero.modules.personal.service.ILawsStandardCollectionService;
+import com.jero.modules.system.service.ISysDictService;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,6 +45,8 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
 	private ILawsOverseasStandardService lawsOverseasStandardService; //海外标准
 	@Autowired
 	private ILawsEnterpriseStandardService ILawsEnterpriseStandardService; //企业标准
+	@Autowired
+	private ISysDictService sysDictService;
 
 
 	/**
@@ -72,6 +75,8 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
 					collection.setNewModelImplementationDate(standard.getNewModelImplementationDate());
 					collection.setOnTheProductionDate(standard.getOnTheProductionDate());
 					collection.setReleaseDate(standard.getReleaseDate());
+					String standard_state = sysDictService.queryDictTextByKey("standard_state", standard.getStandardState());
+					collection.setStandardState(standard_state);
 				}
 			}
 			if (CommonConstant.STANDARD_SOURCE_2.equals(source)){
@@ -81,6 +86,8 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
 					collection.setNewModelImplementationDate(standard.getNewModelImplementationDate());
 					collection.setOnTheProductionDate(standard.getOnTheProductionDate());
 					collection.setReleaseDate(standard.getReleaseDate());
+					String standard_state = sysDictService.queryDictTextByKey("standard_state", standard.getStandardState());
+					collection.setStandardState(standard_state);
 				}
 			}
 			if (CommonConstant.STANDARD_SOURCE_3.equals(source)){
@@ -88,6 +95,8 @@ 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()));
+					collection.setStandardState(standard_state);
 				}
 			}
 		}