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; /** *

@@ -253,11 +256,25 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl> selectTimes(String id) { List standRegionalTimeDto= sarLawsAttrDetailedListDao.selectTimes(id); - Map map = iDicTypeEOService.getDicTypeListCode(); - List> arr = (List>) map.get("COUNTRY"); + +// 查询国家地区字典 + List dicTypeList = dicTypeEODao.getDicTypeByDicId("RFRFRFSCXVB"); + List> arr = dicTypeList.stream() + .map(item -> { + Map map = new HashMap<>(); + map.put("lable", item.getLabel()); + map.put("value", item.getValue()); + return map; + }).collect(Collectors.toList()); +// Map map = iDicTypeEOService.getDicTypeListCode(); +// List> arr = (List>) map.get("COUNTRY"); for (StandRegionalTimeDto list1 : standRegionalTimeDto) { if (StringUtils.isNotBlank(list1.getCountry()) && list1.getCountry().contains(",")) { String[] split = list1.getCountry().split(",");