人口基本信息- 修改人口调用方法

src/main/java/com/cm/population/service/populationinfo/impl/PopulationInfoServiceImpl.java

@@ -1078,7 +1078,26 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul
     public List<PopulationInfoDTO> listByHouseId(String houseId) {
         Map<String, Object> params = getHashMap(2);
         params.put("houseId", houseId);
-        return list(params);
+        List<PopulationInfoDTO> listList = populationInfoDao.listPage(params);
+        ArrayList<String> arr = new ArrayList();
+        for(PopulationInfoDTO dto : listList) {
+            arr.add(dto.getCreator());
+        }
+        List<DataDictionaryDTO> list = iDataDictionaryService.listDictionaryByParentId("5ea50f00-3d76-492c-8680-9c30d50cce21");
+        for(PopulationInfoDTO populationInfoDTO : listList) {
+            // 封装标签回显
+            if (populationInfoDTO != null && !StringUtil.isEmpty(populationInfoDTO.getLabel()) && populationInfoDTO.getLabel().length() > 0) {
+                List<PopulationInfoLabelDTO> 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

src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml

@@ -1717,6 +1717,7 @@
             1 = 1
     </select>
 
+    <!-- 人口看板数量统计 -->
     <select id="countSystem" parameterType="map" resultMap="populationInfoPieDTO">
         SELECT
         <if test="groupBy != null and groupBy == 'getCommunity'">