From a29faa69834220902d843e6dadd6a033c12637ae Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 18 Jun 2020 10:23:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=B0=8F=E7=BB=84=E6=97=A5?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=A1=A5=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/group/impl/GroupDataServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java index c143d10a28..01a8cd979d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java @@ -32,6 +32,11 @@ public class GroupDataServiceImpl implements GroupDataService { @Autowired private DimDateDao dimDateDao; + public DimTimeResultDTO getTimeDim(){ + String dateId = LocalDate.now().minusDays(NumConstant.ONE).toString().replace("-", ""); + return dimDateDao.selectDimTime(dateId); + } + /** * @Description 统计 “小组” 有关数据， dim：【网格-日】 * @param customerId @@ -40,8 +45,7 @@ public class GroupDataServiceImpl implements GroupDataService { */ @Override public List groupGridDaily(String customerId, List gridsInfo) { - String dateId = LocalDate.now().minusDays(NumConstant.ONE).toString().replace("-", ""); - DimTimeResultDTO dimTime = dimDateDao.selectDimTime(dateId); + DimTimeResultDTO dimTime = this.getTimeDim(); List result = new ArrayList<>(); // 1. 网格下有多少小组，只算 state = ‘approved’ @@ -104,7 +108,7 @@ public class GroupDataServiceImpl implements GroupDataService { //TODO 网格下小组增量 GroupIncrFormDTO groupIncr = new GroupIncrFormDTO(); groupIncr.setCustomerId(customerId); - groupIncr.setYesterday(dateId); + groupIncr.setYesterday(dimTime.getDateId()); List groupIncrResult = groupDataDao.selectGroupIncr(groupIncr); result.forEach(grid -> { groupIncrResult.forEach(gridIncr -> {