人群修改

postdischarge-manage/src/main/java/com/xinelu/manage/service/crowdinfo/impl/CrowdInfoServiceImpl.java

@@ -1,14 +1,20 @@
 package com.xinelu.manage.service.crowdinfo.impl;
 
+import com.xinelu.common.core.domain.entity.SysDictData;
 import com.xinelu.common.utils.SecurityUtils;
 import com.xinelu.manage.domain.crowdinfo.CrowdInfo;
 import com.xinelu.manage.mapper.crowdinfo.CrowdInfoMapper;
 import com.xinelu.manage.service.crowdinfo.ICrowdInfoService;
+import com.xinelu.system.mapper.SysDictDataMapper;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * 人群信息Service业务层处理
@@ -20,6 +26,8 @@ import java.util.List;
 public class CrowdInfoServiceImpl implements ICrowdInfoService {
     @Resource
     private CrowdInfoMapper crowdInfoMapper;
+    @Resource
+    private SysDictDataMapper sysDictDataMapper;
 
     /**
      * 查询人群信息
@@ -40,7 +48,27 @@ public class CrowdInfoServiceImpl implements ICrowdInfoService {
      */
     @Override
     public List<CrowdInfo> selectCrowdInfoList(CrowdInfo crowdInfo) {
-        return crowdInfoMapper.selectCrowdInfoList(crowdInfo);
+        List<CrowdInfo> crowdInfos = crowdInfoMapper.selectCrowdInfoList(crowdInfo);
+        if (CollectionUtils.isEmpty(crowdInfos) || crowdInfos.size() == 0) {
+            return crowdInfos;
+        }
+        //字典表匹配数据（特殊人群回显文字）
+        List<SysDictData> crowdType = sysDictDataMapper.selectDictDataByType("crowd_type");
+        if (CollectionUtils.isEmpty(crowdType) || crowdType.size() == 0) {
+            return crowdInfos;
+        }
+        List<String> collect = crowdType.stream().filter(Objects::nonNull).map(SysDictData::getDictValue).distinct().map(String::toLowerCase).collect(Collectors.toList());
+        List<SysDictData> sysDictData = sysDictDataMapper.selectDictDataByTypeList(collect);
+        if (CollectionUtils.isEmpty(sysDictData) || sysDictData.size() == 0) {
+            return crowdInfos;
+        }
+        for (CrowdInfo info : crowdInfos) {
+            SysDictData sysDictData1 = sysDictData.stream().filter(Objects::nonNull).filter(item -> item.getDictValue().equals(info.getSpecialType())).findFirst().orElse(new SysDictData());
+            if (StringUtils.isNotBlank(sysDictData1.getDictLabel())) {
+                info.setSpecialType(sysDictData1.getDictLabel());
+            }
+        }
+        return crowdInfos;
     }
 
     /**

postdischarge-system/src/main/java/com/xinelu/system/mapper/SysDictDataMapper.java

@@ -107,4 +107,12 @@ public interface SysDictDataMapper {
      * @return 字典类型集合信息
      */
     List<SysDictData> selectDictDataAll();
+
+    /**
+     * 根据字典类型查询字典数据
+     *
+     * @param dictType 字典类型
+     * @return 字典数据集合信息
+     */
+    List<SysDictData> selectDictDataByTypeList(List<String> dictType);
 }

postdischarge-system/src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -141,4 +141,12 @@
         )
     </insert>
 
+    <select id="selectDictDataByTypeList" resultType="com.xinelu.common.core.domain.entity.SysDictData">
+        <include refid="selectDictDataVo"/>
+        where status = '0' and dict_type IN
+        <foreach collection="list" item="dictType" open="(" separator="," close=")">
+            #{dictType}
+        </foreach>
+        order by dict_sort asc
+    </select>
 </mapper>