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 9ae5fa7..10f286c 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 @@ -504,15 +504,6 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul populationInfoDTO.setLabels(labels); populationInfoDTO.setLabelList(dataList); } - // 封装所在房屋 - query.put("populationInfoId", populationInfoDTO.getPopulationInfoId()); - List list1 = houseService.list(query); - String houses = ""; - for(HouseDTO dto : list1) { - String house = dto.getResidentialName() + "/" + dto.getBuildingName() + "/" + dto.getAffiliationUnit() + "/" + dto.getHouseNum(); - houses = houses + house + "、"; - } - populationInfoDTO.setHouses(houses); } return listList; } @@ -1072,15 +1063,6 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul } populationInfoDTO.setLabelList(dataList); } - // 封装所在房屋 - query.put("populationInfoId", populationInfoDTO.getPopulationInfoId()); - List list1 = houseService.list(query); - String houses = ""; - for(HouseDTO dto : list1) { - String house = dto.getResidentialName() + "/" + dto.getBuildingName() + "/" + dto.getAffiliationUnit() + "/" + dto.getHouseNum(); - houses = houses + house + "、"; - } - populationInfoDTO.setHouses(houses); } return listList; } @@ -1149,15 +1131,6 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul } populationInfoDTO.setLabelList(dataList); } - // 封装所在房屋 - query.put("populationInfoId", populationInfoDTO.getPopulationInfoId()); - List list1 = houseService.list(query); - String houses = ""; - for(HouseDTO dto : list1) { - String house = dto.getResidentialName() + "/" + dto.getBuildingName() + "/" + dto.getAffiliationUnit() + "/" + dto.getHouseNum(); - houses = houses + house + "、"; - } - populationInfoDTO.setHouses(houses); } PageInfo pageInfo = new PageInfo<>(listList); return new SuccessResultList<>(listList, pageInfo.getPageNum(), pageInfo.getTotal()); @@ -1327,7 +1300,7 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul // 封装标签回显 if (populationInfoDTO != null && !StringUtil.isEmpty(populationInfoDTO.getLabel()) && populationInfoDTO.getLabel().length() > 0) { List dataList = new ArrayList<>(); - for(DataDictionaryDTO dto : list) { + 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); @@ -1335,15 +1308,6 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul } populationInfoDTO.setLabelList(dataList); } - // 封装所在房屋 - query.put("populationInfoId", populationInfoDTO.getPopulationInfoId()); - List list1 = houseService.list(query); - String houses = ""; - for(HouseDTO dto : list1) { - String house = dto.getResidentialName() + "/" + dto.getBuildingName() + "/" + dto.getAffiliationUnit() + "/" + dto.getHouseNum(); - houses = houses + house + "、"; - } - populationInfoDTO.setHouses(houses); } PageInfo pageInfo = new PageInfo<>(listList); return new SuccessResultList<>(listList, pageInfo.getPageNum(), pageInfo.getTotal()); @@ -1412,15 +1376,6 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul break; } } - // 封装所在房屋 - query.put("populationInfoId", populationInfoDTO.getPopulationInfoId()); - List list1 = houseService.list(query); - String houses = ""; - for(HouseDTO dto : list1) { - String house = dto.getResidentialName() + "/" + dto.getBuildingName() + "/" + dto.getAffiliationUnit() + "/" + dto.getHouseNum(); - houses = houses + house + "、"; - } - populationInfoDTO.setHouses(houses); } PageInfo pageInfo = new PageInfo<>(listList); return new SuccessResultList<>(listList, pageInfo.getPageNum(), pageInfo.getTotal()); diff --git a/src/main/resources/templates/populationinfo/list-bigdata.html b/src/main/resources/templates/populationinfo/list-bigdata.html index 3bfebf1..f01a417 100644 --- a/src/main/resources/templates/populationinfo/list-bigdata.html +++ b/src/main/resources/templates/populationinfo/list-bigdata.html @@ -977,8 +977,7 @@ {name: '是否为党员', key: 'isParty'}, {name: '党组织名称', key: 'partyOrganization'}, {name: '入党时间', key: 'partyTime'}, - {name: '其他', key: 'othertext'}, - {name: '所在房屋', key: 'houses', color: 'FF0000'} + {name: '其他', key: 'othertext'} ]; /**