Browse Source

居民信息采集-数据浏览bug修改

feature/syp_points
songyunpeng 5 years ago
parent
commit
33ff7d4d3a
  1. 15
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/HousingInformationController.java
  2. BIN
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/excel/居民信息录入模板.xls

15
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/HousingInformationController.java

@ -171,13 +171,14 @@ public class HousingInformationController {
}
//没有户主信息的房屋,转换excel时,替换是否时会出现null,此时将对应null值替换成空字符
basePopulationInformationExcelList.forEach(basePopulationInformationExportDto ->{
basePopulationInformationExportDto.setResidentsSex("");
basePopulationInformationExportDto.setMilitaryService("");
basePopulationInformationExportDto.setReemploymentPermit("");
basePopulationInformationExportDto.setUnemploymentRegister("");
basePopulationInformationExportDto.setDogStatus("");
});
if(StringUtils.isBlank(basePopulationInformationExportDto.getId())){
basePopulationInformationExportDto.setResidentsSex("");
basePopulationInformationExportDto.setMilitaryService("");
basePopulationInformationExportDto.setReemploymentPermit("");
basePopulationInformationExportDto.setUnemploymentRegister("");
basePopulationInformationExportDto.setDogStatus("");
}
});
//根据获取的户主ID查询居住人信息
List<BasePopulationInformationExportDto> basePopulationInformationExcelListWithHouseHead = new ArrayList<>();

BIN
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/excel/居民信息录入模板.xls

Binary file not shown.
Loading…
Cancel
Save