From cf32754f130955a617836cae7685c1a24979060c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 19 三月 2025 17:25:54 +0800
Subject: [PATCH] 修改报表bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
index f411893..742c6f2 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
@@ -20,6 +20,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -144,17 +145,17 @@
List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore);
- Map<String, Object> countAll(LocalDate sixBefore,List<Integer> siteIds);
+ Map<String, Object> countAll(LocalDateTime sixBefore, List<Integer> siteIds);
- List<Map<String, Object>> getSumByType(LocalDate start,LocalDate end);
+ List<Map<String, Object>> getSumByType(LocalDate start,LocalDate end,List<Integer> siteIds);
- List<Map<String, Object>> getDateData(LocalDate start,LocalDate end);
+ List<Map<String, Object>> getDateData(LocalDate start,LocalDate end,List<Integer> siteIds);
- List<Map<String, Object>> getWeekData(LocalDate start,LocalDate end);
+ List<Map<String, Object>> getWeekData(LocalDate start,LocalDate end,List<Integer> siteIds);
- List<Map<String, Object>> getMonthData(LocalDate start,LocalDate end);
+ List<Map<String, Object>> getMonthData(LocalDate start,LocalDate end,List<Integer> siteIds);
- List<Map<String, Object>> getYearData(LocalDate start,LocalDate end);
+ List<Map<String, Object>> getYearData(LocalDate start,LocalDate end,List<Integer> siteIds);
ChargingOrderTimeVO chargingList(ChargingListQuery dto);
@@ -190,7 +191,7 @@
*/
void excelEndCharge(String orderCode);
- List<Map<String, Object>> getByDate(LocalDate start,LocalDate end);
+ List<Map<String, Object>> getByDate(LocalDate start,LocalDate end, List<Integer> siteIds);
List<Map<String, Object>> queryPower(List<Integer> siteIds);
--
Gitblit v1.7.1