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 218524d9a6..6b34fda27a 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 @@ -144,11 +144,15 @@ public class FactUserHouseServiceImpl implements FactUserHouseService { dto.setHouseSelfCount(houseOptional.get().getHouseSelfCount()); dto.setHouseLeaseCount(houseOptional.get().getHouseLeaseCount()); dto.setHouseIdleCount(houseOptional.get().getHouseIdleCount()); + dto.setHouseIncr(houseOptional.get().getHouseIncr()); + dto.setHouseModify(houseOptional.get().getHouseModify()); } else { dto.setHouseCount(NumConstant.ZERO); dto.setHouseSelfCount(NumConstant.ZERO); dto.setHouseLeaseCount(NumConstant.ZERO); dto.setHouseIdleCount(NumConstant.ZERO); + dto.setHouseIncr(NumConstant.ZERO); + dto.setHouseModify(NumConstant.ZERO); } Optional userOptional = userList.stream().filter(user -> gridId.equals(user.getGridId()) && customerId.equals(user.getCustomerId())).findFirst(); @@ -156,10 +160,14 @@ public class FactUserHouseServiceImpl implements FactUserHouseService { dto.setUserCount(userOptional.get().getUserCount()); dto.setUserResiCount(userOptional.get().getUserResiCount()); dto.setUserFloatCount(userOptional.get().getUserFloatCount()); + dto.setUserIncr(userOptional.get().getUserIncr()); + dto.setUserModify(userOptional.get().getUserModify()); } else { dto.setUserCount(NumConstant.ZERO); dto.setUserResiCount(NumConstant.ZERO); dto.setUserFloatCount(NumConstant.ZERO); + dto.setUserIncr(NumConstant.ZERO); + dto.setUserModify(NumConstant.ZERO); } addList.add(dto); });