|
|
|
@ -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<>(); |
|
|
|
|