diff --git a/src/main/java/com/cm/population/service/populationinfo/impl/PopulationInfoServiceImpl.java b/src/main/java/com/cm/population/service/populationinfo/impl/PopulationInfoServiceImpl.java index d1c411d..eb87b66 100644 --- a/src/main/java/com/cm/population/service/populationinfo/impl/PopulationInfoServiceImpl.java +++ b/src/main/java/com/cm/population/service/populationinfo/impl/PopulationInfoServiceImpl.java @@ -1078,7 +1078,26 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul public List listByHouseId(String houseId) { Map params = getHashMap(2); params.put("houseId", houseId); - return list(params); + List listList = populationInfoDao.listPage(params); + ArrayList arr = new ArrayList(); + for(PopulationInfoDTO dto : listList) { + arr.add(dto.getCreator()); + } + List list = iDataDictionaryService.listDictionaryByParentId("5ea50f00-3d76-492c-8680-9c30d50cce21"); + for(PopulationInfoDTO populationInfoDTO : listList) { + // 封装标签回显 + if (populationInfoDTO != null && !StringUtil.isEmpty(populationInfoDTO.getLabel()) && populationInfoDTO.getLabel().length() > 0) { + List dataList = new ArrayList<>(); + for(DataDictionaryDTO dto : list) { + if (populationInfoDTO.getLabel().contains(dto.getDictionaryId())) { + PopulationInfoLabelDTO D = new PopulationInfoLabelDTO(dto.getDictionaryId(), dto.getDictionaryName(), dto.getDictionarySummary(), dto.getDictionarySort()); + dataList.add(D); + } + } + populationInfoDTO.setLabelList(dataList); + } + } + return listList; } @Override diff --git a/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml b/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml index 18c834a..730ef52 100644 --- a/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml +++ b/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml @@ -1717,6 +1717,7 @@ 1 = 1 +