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);