From 341bf493192cd29a247dc8639028149ec12399e9 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 1 Jul 2021 15:18:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datastats/impl/DataStatsServiceImpl.java | 34 ++----------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 984ce2156a..9c9e8b0333 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -293,38 +293,8 @@ public class DataStatsServiceImpl implements DataStatsService { if (subAgencyList.size() < NumConstant.ONE) { return resultList; } - // List agencyIds = subAgencyList.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList()); - - subAgencyList.forEach(sub->{ - //0.根据组织Id查询是否存在子客户，存在的按areaCode查询当前客户之外的客户组织列表 - List agencyList = indexService.getAgencyIdsByAgencyId(formDTO.getAgencyId()); - agencyList.add(sub.getAgencyId()); - //2.查询直属下级组织注册用户日统计数据，默认按用户总数降序 - List list = dataStatsDao.getSubAgencyUser(agencyList, formDTO.getDateId()); - - //3.封装数据 - int userTotal = 0; - int resiTotal = 0; - int partyMemberTotal = 0; - for (SubAgencyUserResultDTO u : list){ - userTotal+=u.getUserTotal(); - resiTotal+=u.getResiTotal(); - partyMemberTotal+=u.getPartyMemberTotal(); - } - SubAgencyUserResultDTO dto = new SubAgencyUserResultDTO(); - dto.setAgencyId(sub.getAgencyId()); - dto.setAgencyName(sub.getAgencyName()); - dto.setLevel(null == sub.getLevel() ? "" : sub.getLevel()); - dto.setAreaCode(null == sub.getAreaCode() ? "" : sub.getAreaCode()); - dto.setUserTotal(userTotal); - dto.setPartyMemberTotal(partyMemberTotal); - dto.setResiTotal(resiTotal); - dto.setPartyMemberRatio(dto.getPartyMemberTotal() == 0 || dto.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getPartyMemberTotal() / (float) dto.getUserTotal()))); - dto.setResiRatio(dto.getResiTotal() == 0 || dto.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getResiTotal() / (float) dto.getUserTotal()))); - resultList.add(dto); - }); + List agencyIds = subAgencyList.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList()); - /* //2.查询直属下级组织注册用户日统计数据，默认按用户总数降序 List list = dataStatsDao.getSubAgencyUser(agencyIds, formDTO.getDateId()); @@ -346,7 +316,7 @@ public class DataStatsServiceImpl implements DataStatsService { dto.setResiRatio(dto.getResiTotal() == 0 || dto.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getResiTotal() / (float) dto.getUserTotal()))); resultList.add(dto); } -*/ + //4.按要求排序并返回 Collections.sort(resultList, new Comparator() { @Override