From a1b951afba304affbeee6f8ee6835f0927bbfb68 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 02 十一月 2024 13:59:27 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 57b0caa..13f6333 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
@@ -232,7 +232,7 @@
SettlementTotalVO settlementTotal(String time);
- List<Map<String, Object>> countBySource(List<Integer> siteIds);
+ List<Map<String, Object>> countBySource(List<Integer> siteIds,ChargingStatisticsQueryDto statisticsQueryDto);
List<Map<String, Object>> equipmentUserType1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
@@ -277,4 +277,6 @@
* @return
*/
List<TChargingOrder> getChargingOrder(TChargingOrderVo order);
+
+ Long countCar(List<String> brands);
}
--
Gitblit v1.7.1