From ddb8442c0f37a8d6b31e088ee5a8579b48c2b34e Mon Sep 17 00:00:00 2001 From: zt916916 <1903964620@qq.com> Date: 星期五, 21 三月 2025 11:21:12 +0800 Subject: [PATCH] 更新 DateTimeUtil.java --- zhitan-admin/src/main/java/com/zhitan/web/controller/comprehensivestatistics/YearComprehensiveController.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/comprehensivestatistics/YearComprehensiveController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/comprehensivestatistics/YearComprehensiveController.java index fc5a46c..3f6a91b 100644 --- a/zhitan-admin/src/main/java/com/zhitan/web/controller/comprehensivestatistics/YearComprehensiveController.java +++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/comprehensivestatistics/YearComprehensiveController.java @@ -74,7 +74,7 @@ i++; } List<YearComperhensive> list = yearComprehensive.getYearComprehensiveList(modelNode.getNodeId(), - dataList,dataItem.getBeginTime(), dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getIndexStorageId()); + dataList,dataItem.getBeginTime(), dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType()); return AjaxResult.success(list); } catch (Exception ex) { logger.error("鑾峰彇鍑洪敊锛�", ex); @@ -92,7 +92,7 @@ dataItem.setBeginTime(DateUtil.beginOfYear(dataItem.getDataTime())); dataItem.setEndTime(DateUtil.endOfYear(dataItem.getDataTime())); - List<YearComperhensive> list = yearComprehensive.getListChart(dataItem.getIndexId(),dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getIndexStorageId()); + List<YearComperhensive> list = yearComprehensive.getListChart(dataItem.getIndexId(),dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType()); return AjaxResult.success(list); } @@ -127,7 +127,7 @@ i++; } List<YearComperhensive> list = yearComprehensive.getYearComprehensiveList(modelNode.getNodeId(), - dataList,dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getIndexStorageId()); + dataList,dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType()); if(CollectionUtils.isNotEmpty(list)){ list.forEach(this::valueRep); } -- Gitblit v1.9.3