From 1ac2a7601fe71f960f1f544bc5b029d555866660 Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期三, 12 二月 2025 11:34:57 +0800
Subject: [PATCH] 修改传参能源品种的过滤条件
---
zhitan-admin/src/main/java/com/zhitan/web/controller/comprehensivestatistics/YearComprehensiveController.java | 10 +++++++---
1 files changed, 7 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 ead5b3f..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);
@@ -88,7 +88,11 @@
@GetMapping("/listChart")
@ApiOperation(value = "鑾峰彇缁煎悎鎸囨爣鍒嗘瀽鍥捐〃锛堝勾锛夋暟鎹�")
public AjaxResult listChart(DataItem dataItem){
- List<YearComperhensive> list = yearComprehensive.getListChart(dataItem.getIndexId(),dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getIndexStorageId());
+
+ 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.getEnergyType());
return AjaxResult.success(list);
}
@@ -123,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