diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java index c9f3baac89..2681ca34cb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java @@ -87,7 +87,7 @@ public class FactUserHouseServiceImpl implements FactUserHouseService { List addList = new ArrayList<>(); neiList.forEach(item -> { - String agencyId = item.getAgencyId(); + String gridId = item.getGridId(); FactUserHouseResultDTO dto = new FactUserHouseResultDTO(); dto.setCustomerId(formDTO.getCustomerId()); dto.setDateId(dateId); @@ -95,7 +95,7 @@ public class FactUserHouseServiceImpl implements FactUserHouseService { dto.setPids(item.getPids()); dto.setNeighbourhoodsCount(item.getNeighbourhoodsCount()); - Optional houseOptional = houseList.stream().filter(house -> agencyId.equals(house.getAgencyId()) && customerId.equals(house.getCustomerId())).findFirst(); + Optional houseOptional = houseList.stream().filter(house -> gridId.equals(house.getGridId()) && customerId.equals(house.getCustomerId())).findFirst(); if (houseOptional.isPresent()) { dto.setHouseCount(houseOptional.get().getHouseCount()); dto.setHouseSelfCount(houseOptional.get().getHouseSelfCount()); @@ -108,7 +108,7 @@ public class FactUserHouseServiceImpl implements FactUserHouseService { dto.setHouseIdleCount(NumConstant.ZERO); } - Optional userOptional = userList.stream().filter(user -> agencyId.equals(user.getAgencyId()) && customerId.equals(user.getCustomerId())).findFirst(); + Optional userOptional = userList.stream().filter(user -> gridId.equals(user.getGridId()) && customerId.equals(user.getCustomerId())).findFirst(); if (userOptional.isPresent()) { dto.setUserCount(userOptional.get().getUserCount()); dto.setUserResiCount(userOptional.get().getUserResiCount());