elink-star
/
epmet-cloud-lingshan
forked from luyan/epmet-cloud-lingshan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

检测gridId而非agency

master
zhangyuan 3 years ago
parent
0347a88abc
commit
751d1099be
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java

6
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java
View File

@ -87,7 +87,7 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
List<FactUserHouseResultDTO> addList = new ArrayList<>(); List<FactUserHouseResultDTO> addList = new ArrayList<>();
neiList.forEach(item -> { neiList.forEach(item -> {
String agencyId = item.getAgencyId(); String gridId = item.getGridId();
FactUserHouseResultDTO dto = new FactUserHouseResultDTO(); FactUserHouseResultDTO dto = new FactUserHouseResultDTO();
dto.setCustomerId(formDTO.getCustomerId()); dto.setCustomerId(formDTO.getCustomerId());
dto.setDateId(dateId); dto.setDateId(dateId);
@ -95,7 +95,7 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
dto.setPids(item.getPids()); dto.setPids(item.getPids());
dto.setNeighbourhoodsCount(item.getNeighbourhoodsCount()); dto.setNeighbourhoodsCount(item.getNeighbourhoodsCount());
Optional<FactUserHouseResultDTO> houseOptional = houseList.stream().filter(house -> agencyId.equals(house.getAgencyId()) && customerId.equals(house.getCustomerId())).findFirst(); Optional<FactUserHouseResultDTO> houseOptional = houseList.stream().filter(house -> gridId.equals(house.getGridId()) && customerId.equals(house.getCustomerId())).findFirst();
if (houseOptional.isPresent()) { if (houseOptional.isPresent()) {
dto.setHouseCount(houseOptional.get().getHouseCount()); dto.setHouseCount(houseOptional.get().getHouseCount());
dto.setHouseSelfCount(houseOptional.get().getHouseSelfCount()); dto.setHouseSelfCount(houseOptional.get().getHouseSelfCount());
@ -108,7 +108,7 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
dto.setHouseIdleCount(NumConstant.ZERO); dto.setHouseIdleCount(NumConstant.ZERO);
} }
Optional<FactUserHouseResultDTO> userOptional = userList.stream().filter(user -> agencyId.equals(user.getAgencyId()) && customerId.equals(user.getCustomerId())).findFirst(); Optional<FactUserHouseResultDTO> userOptional = userList.stream().filter(user -> gridId.equals(user.getGridId()) && customerId.equals(user.getCustomerId())).findFirst();
if (userOptional.isPresent()) { if (userOptional.isPresent()) {
dto.setUserCount(userOptional.get().getUserCount()); dto.setUserCount(userOptional.get().getUserCount());
dto.setUserResiCount(userOptional.get().getUserResiCount()); dto.setUserResiCount(userOptional.get().getUserResiCount());

Write Preview
Loading…
Cancel
Save