Tenlion/btxtgxq-system-population
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

人口基本信息- 增加了自定义Excel导出功能

Browse Source
This commit is contained in:
java_cuibaocheng@163.com 2024-01-30 15:50:49 +08:00
parent c88fe69fd2
commit 2fd49f17f4
2 changed files with 2 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -504,15 +504,6 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul
populationInfoDTO.setLabels(labels); populationInfoDTO.setLabels(labels);
populationInfoDTO.setLabelList(dataList); populationInfoDTO.setLabelList(dataList);
} }
// 封装所在房屋
query.put("populationInfoId", populationInfoDTO.getPopulationInfoId());
List<HouseDTO> 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; return listList;
} }
@ -1072,15 +1063,6 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul
} }
populationInfoDTO.setLabelList(dataList); populationInfoDTO.setLabelList(dataList);
} }
// 封装所在房屋
query.put("populationInfoId", populationInfoDTO.getPopulationInfoId());
List<HouseDTO> 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; return listList;
} }
@ -1149,15 +1131,6 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul
} }
populationInfoDTO.setLabelList(dataList); populationInfoDTO.setLabelList(dataList);
} }
// 封装所在房屋
query.put("populationInfoId", populationInfoDTO.getPopulationInfoId());
List<HouseDTO> 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<PopulationInfoDTO> pageInfo = new PageInfo<>(listList); PageInfo<PopulationInfoDTO> pageInfo = new PageInfo<>(listList);
return new SuccessResultList<>(listList, pageInfo.getPageNum(), pageInfo.getTotal()); 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) { if (populationInfoDTO != null && !StringUtil.isEmpty(populationInfoDTO.getLabel()) && populationInfoDTO.getLabel().length() > 0) {
List<PopulationInfoLabelDTO> dataList = new ArrayList<>(); List<PopulationInfoLabelDTO> dataList = new ArrayList<>();
for(DataDictionaryDTO dto : list) { for (DataDictionaryDTO dto : list) {
if (populationInfoDTO.getLabel().contains(dto.getDictionaryId())) { if (populationInfoDTO.getLabel().contains(dto.getDictionaryId())) {
PopulationInfoLabelDTO D = new PopulationInfoLabelDTO(dto.getDictionaryId(), dto.getDictionaryName(), dto.getDictionarySummary(), dto.getDictionarySort()); PopulationInfoLabelDTO D = new PopulationInfoLabelDTO(dto.getDictionaryId(), dto.getDictionaryName(), dto.getDictionarySummary(), dto.getDictionarySort());
dataList.add(D); dataList.add(D);
@ -1335,15 +1308,6 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul
} }
populationInfoDTO.setLabelList(dataList); populationInfoDTO.setLabelList(dataList);
} }
// 封装所在房屋
query.put("populationInfoId", populationInfoDTO.getPopulationInfoId());
List<HouseDTO> 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<PopulationInfoDTO> pageInfo = new PageInfo<>(listList); PageInfo<PopulationInfoDTO> pageInfo = new PageInfo<>(listList);
return new SuccessResultList<>(listList, pageInfo.getPageNum(), pageInfo.getTotal()); return new SuccessResultList<>(listList, pageInfo.getPageNum(), pageInfo.getTotal());
@ -1412,15 +1376,6 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul
break; break;
} }
} }
// 封装所在房屋
query.put("populationInfoId", populationInfoDTO.getPopulationInfoId());
List<HouseDTO> 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<PopulationInfoDTO> pageInfo = new PageInfo<>(listList); PageInfo<PopulationInfoDTO> pageInfo = new PageInfo<>(listList);
return new SuccessResultList<>(listList, pageInfo.getPageNum(), pageInfo.getTotal()); return new SuccessResultList<>(listList, pageInfo.getPageNum(), pageInfo.getTotal());

3
src/main/resources/templates/populationinfo/list-bigdata.html
View File

@ -977,8 +977,7 @@
{name: '是否为党员', key: 'isParty'}, {name: '是否为党员', key: 'isParty'},
{name: '党组织名称', key: 'partyOrganization'}, {name: '党组织名称', key: 'partyOrganization'},
{name: '入党时间', key: 'partyTime'}, {name: '入党时间', key: 'partyTime'},
{name: '其他', key: 'othertext'}, {name: '其他', key: 'othertext'}
{name: '所在房屋', key: 'houses', color: 'FF0000'}
]; ];
/** /**