From 136aaf618655518e78d7cb5ee521d4eb4a795963 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Sat, 20 Jun 2020 15:00:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=B0=8F=E7=BB=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/group/impl/GroupDataServiceImpl.java | 5 +---- .../java/com/epmet/service/impl/StatsGroupServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 5 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 2ee8c38550..cb548823c7 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 @@ -59,12 +59,9 @@ public class GroupDataServiceImpl implements GroupDataService { }); }else { result.forEach(grid -> { - GroupGridDailyResultDTO dailyResult = new GroupGridDailyResultDTO(); - BeanUtils.copyProperties(dimTime, dailyResult); - dailyResult.setAgencyId(grid.getAgencyId()); gridGroupTotalResultDTOS.forEach(groupTotal -> { if (grid.getGridId().equals(groupTotal.getGridId())) { - dailyResult.setGroupTotal(groupTotal.getGridGroupTotal()); + grid.setGroupTotal(groupTotal.getGridGroupTotal()); } }); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java index df312995fb..82278d4340 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java @@ -224,7 +224,7 @@ public class StatsGroupServiceImpl implements StatsGroupService { */ public DimIdGenerator.DimIdBean getDimIdBean(){ ZoneId zoneId = ZoneId.systemDefault(); - LocalDate localDate = LocalDate.now(); + LocalDate localDate = LocalDate.now().minusDays(NumConstant.ONE); ZonedDateTime zdt = localDate.atStartOfDay(zoneId); Date date = Date.from(zdt.toInstant()); return DimIdGenerator.getDimIdBean(date);