jianjun 3 years ago
parent
commit
0437baf980
  1. 2
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
  2. 3
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

2
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java

@ -49,7 +49,7 @@ public class IcHouseListResultDTO implements Serializable {
*/ */
private String buildingName; private String buildingName;
/** /**
* 单元号 * 单元号_单元
*/ */
private String unitNum; private String unitNum;
/** /**

3
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@ -500,14 +500,13 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
} }
PageData<IcHouseListResultDTO> houseData = this.getHouseList(formDTO); PageData<IcHouseListResultDTO> houseData = this.getHouseList(formDTO);
List<HouseMemberResultDTO> resultDTOS = ConvertUtils.sourceToTarget(houseData.getList(), HouseMemberResultDTO.class);
List<HouseMemberResultDTO> resultList = new ArrayList<>(); List<HouseMemberResultDTO> resultList = new ArrayList<>();
PageData<HouseMemberResultDTO> result = new PageData<>(resultList,houseData.getList().size()); PageData<HouseMemberResultDTO> result = new PageData<>(resultList,houseData.getList().size());
int finalSearchLevel = searchLevel; int finalSearchLevel = searchLevel;
AtomicInteger num = new AtomicInteger((formDTO.getPageNo()-1) * formDTO.getPageSize()); AtomicInteger num = new AtomicInteger((formDTO.getPageNo()-1) * formDTO.getPageSize());
resultDTOS.forEach(o ->{ houseData.getList().forEach(o ->{
resiParam.setNeighborHoodId(o.getNeighborHoodId()); resiParam.setNeighborHoodId(o.getNeighborHoodId());
if (finalSearchLevel == 1){ if (finalSearchLevel == 1){

Loading…
Cancel
Save