人群修改
This commit is contained in:
parent
22174ad795
commit
f273b5a5a5
@ -53,19 +53,23 @@ public class CrowdInfoServiceImpl implements ICrowdInfoService {
|
|||||||
return crowdInfos;
|
return crowdInfos;
|
||||||
}
|
}
|
||||||
//字典表匹配数据(特殊人群回显文字)
|
//字典表匹配数据(特殊人群回显文字)
|
||||||
List<SysDictData> crowdType = sysDictDataMapper.selectDictDataByType("crowd_type");
|
List<SysDictData> crowdTypeList = sysDictDataMapper.selectDictDataByType("crowd_type");
|
||||||
if (CollectionUtils.isEmpty(crowdType) || crowdType.size() == 0) {
|
if (CollectionUtils.isEmpty(crowdTypeList) || crowdTypeList.size() == 0) {
|
||||||
return crowdInfos;
|
return crowdInfos;
|
||||||
}
|
}
|
||||||
List<String> collect = crowdType.stream().filter(Objects::nonNull).map(SysDictData::getDictValue).distinct().map(String::toLowerCase).collect(Collectors.toList());
|
List<String> collect = crowdTypeList.stream().filter(Objects::nonNull).map(SysDictData::getDictValue).distinct().map(String::toLowerCase).collect(Collectors.toList());
|
||||||
List<SysDictData> sysDictData = sysDictDataMapper.selectDictDataByTypeList(collect);
|
List<SysDictData> sysDictDataList = sysDictDataMapper.selectDictDataByTypeList(collect);
|
||||||
if (CollectionUtils.isEmpty(sysDictData) || sysDictData.size() == 0) {
|
if (CollectionUtils.isEmpty(sysDictDataList) || sysDictDataList.size() == 0) {
|
||||||
return crowdInfos;
|
return crowdInfos;
|
||||||
}
|
}
|
||||||
for (CrowdInfo info : crowdInfos) {
|
for (CrowdInfo info : crowdInfos) {
|
||||||
SysDictData sysDictData1 = sysDictData.stream().filter(Objects::nonNull).filter(item -> item.getDictValue().equals(info.getSpecialType())).findFirst().orElse(new SysDictData());
|
SysDictData crowdType = crowdTypeList.stream().filter(Objects::nonNull).filter(item -> item.getDictValue().equals(info.getCrowdType())).findFirst().orElse(new SysDictData());
|
||||||
if (StringUtils.isNotBlank(sysDictData1.getDictLabel())) {
|
if (StringUtils.isNotBlank(crowdType.getDictLabel())) {
|
||||||
info.setSpecialType(sysDictData1.getDictLabel());
|
info.setCrowdType(crowdType.getDictLabel());
|
||||||
|
}
|
||||||
|
SysDictData sysDictData = sysDictDataList.stream().filter(Objects::nonNull).filter(item -> item.getDictValue().equals(info.getSpecialType())).findFirst().orElse(new SysDictData());
|
||||||
|
if (StringUtils.isNotBlank(sysDictData.getDictLabel())) {
|
||||||
|
info.setSpecialType(sysDictData.getDictLabel());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return crowdInfos;
|
return crowdInfos;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user