diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java index 66bfdfa4ad..3d2e8a0360 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java @@ -37,7 +37,7 @@ public class HouseMemberResultDTO implements Serializable { @ExcelProperty(value = {"房屋信息","所属楼栋"},index = 4) private String buildingName; @ExcelProperty(value = {"房屋信息","单元"},index = 5) - private String unitName; + private String unitNum; /** * 门牌号 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 7cacfb2513..eb2e64d1e8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -507,7 +507,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { int finalSearchLevel = searchLevel; AtomicInteger num = new AtomicInteger((formDTO.getPageNo()-1) * formDTO.getPageSize()); - resultDTOS.stream().forEach(o ->{ + resultDTOS.forEach(o ->{ resiParam.setNeighborHoodId(o.getNeighborHoodId()); if (finalSearchLevel == 1){ @@ -537,7 +537,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { resultDTO.setGridName(o.getGridName()); resultDTO.setNeighborHoodName(o.getNeighborHoodName()); resultDTO.setBuildingName(o.getBuildingName()); - resultDTO.setUnitName(o.getUnitName()); + resultDTO.setUnitNum(o.getUnitNum()); resultDTO.setDoorName(o.getDoorName()); resultDTO.setHouseType(o.getHouseType()); resultDTO.setPurpose(o.getPurpose());