From ad9f15116e0f715e27bb031d7a86b6b1e102e90a Mon Sep 17 00:00:00 2001
From: wangzhijiang <1358525938@qq.com>
Date: Tue, 20 Jun 2023 15:53:23 +0800
Subject: [PATCH] =?UTF-8?q?71103=E4=BF=AE=E6=94=B9,=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E5=BA=93=E5=9B=9E=E6=98=BE=E7=8A=B6=E6=80=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SearchCenterServiceImpl.java | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/SearchCenterServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/SearchCenterServiceImpl.java
index 08d0a96ca..c671c83d1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/SearchCenterServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/SearchCenterServiceImpl.java
@@ -14,6 +14,7 @@ import com.jero.modules.collection.entity.OnlCgformCollection;
 import com.jero.modules.collection.service.IOnlCgformCollectionService;
 import com.jero.modules.document.enums.SearchEnum;
 import com.jero.modules.document.service.IBussDocumentLibraryEOService;
+import com.jero.modules.enums.DictCodeEnum;
 import com.jero.modules.phone.service.ISearchCenterService;
 import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO;
 import com.jero.modules.problemKnowledgeBase.enums.ReleaseStatusEnum;
@@ -22,7 +23,9 @@ import com.jero.modules.report.entity.LawsMonthlyReportManageEO;
 import com.jero.modules.report.service.ILawsMonthlyReportManageEOService;
 import com.jero.modules.subscribe.entity.OnlCgformSubscribe;
 import com.jero.modules.subscribe.service.IOnlCgformSubscribeService;
+import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.service.ISysUserService;
+import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -54,6 +57,8 @@ public class SearchCenterServiceImpl implements ISearchCenterService {
     @Autowired
     private JeroElasticsearchTemplate jeroElasticsearchTemplate;
     public static final String SEARCH_FLAG = "魑";//标识(es数据带此标识的代表全文和段落的数据,不带此标识的代表列表数据)
+    @Autowired
+    private SysDictItemServiceImpl sysDictItemServiceImpl;
 
     @Override
     public Result<Map<String, Object>> getDataCount() {
@@ -237,6 +242,8 @@ public class SearchCenterServiceImpl implements ISearchCenterService {
             );
         }
 
+        List<SysDictItem> stateSysDictItems = this.sysDictItemServiceImpl.selectItemsByDictCode(DictCodeEnum.STATE.getValue());
+
         List<Map<String, Object>> list = (List<Map<String, Object>>) (((Map) search.get("hits")).get("hits"));
         List<Map<String, Object>> mapList = new ArrayList<>();
         for (Map<String, Object> map : list) {
@@ -253,6 +260,20 @@ public class SearchCenterServiceImpl implements ISearchCenterService {
                     mapSource.put(key,fieldConyent);
                 }
             }
+            String state = (String) mapSource.get("state");
+            String state_dictText = "";
+            for (SysDictItem dictItem : stateSysDictItems) {
+                if (StringUtils.equals(dictItem.getItemValue(), state)) {
+                    if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+                        state_dictText = dictItem.getItemText();
+                    } else {
+                        state_dictText = dictItem.getEnName();
+                    }
+                    break;
+                }
+            }
+            mapSource.put("state_dictText", state_dictText);
+
             String create_time_str = "";
             if(ObjectUtils.isNotEmpty(mapSource.get("create_time"))){
                 create_time_str = DateUtils.formatTime((Long) mapSource.get("create_time"));