From d0929b3c580fd3c3f3a86af250420eaca4dde436 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sat, 22 Jan 2022 14:42:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=B9=E6=B3=95=E9=A2=97?=
 =?UTF-8?q?=E7=B2=92=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarLawsAttrDetailedListServiceImpl.java   | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java
index 8b975cfa..8c6f09cc 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java
@@ -4,6 +4,8 @@ import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao;
 import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*;
 import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService;
 import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto;
+import com.adc.da.sys.common.SelectionResult;
+import com.adc.da.sys.dao.DicTypeEODao;
 import com.adc.da.sys.service.IDicTypeEOService;
 import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -19,6 +21,7 @@ import org.springframework.util.CollectionUtils;
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -253,11 +256,25 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
         return sarLawsAttrDetailedListDao.updateById(sarLawsAttrDetailedList);
     }
 
+
+    @Autowired
+    private DicTypeEODao dicTypeEODao;
+
     @Override
     public Map<String, List<String>> selectTimes(String id) {
         List<StandRegionalTimeDto> standRegionalTimeDto= sarLawsAttrDetailedListDao.selectTimes(id);
-        Map<String, Object> map = iDicTypeEOService.getDicTypeListCode();
-        List<Map<String, String>> arr = (List<Map<String, String>>) map.get("COUNTRY");
+
+//        查询国家地区字典
+        List<SelectionResult> dicTypeList = dicTypeEODao.getDicTypeByDicId("RFRFRFSCXVB");
+        List<Map<String, String>> arr = dicTypeList.stream()
+                .map(item -> {
+                    Map<String, String> map = new HashMap<>();
+                    map.put("lable", item.getLabel());
+                    map.put("value", item.getValue());
+                    return map;
+                }).collect(Collectors.toList());
+//        Map<String, Object> map = iDicTypeEOService.getDicTypeListCode();
+//        List<Map<String, String>> arr = (List<Map<String, String>>) map.get("COUNTRY");
         for (StandRegionalTimeDto list1 : standRegionalTimeDto) {
             if (StringUtils.isNotBlank(list1.getCountry()) && list1.getCountry().contains(",")) {
                 String[] split = list1.getCountry().split(",");