From 00779ea0f8374e5bbdffc8faa20d65e3c72616c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 02 十一月 2024 19:26:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 bd3928f..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
@@ -18,6 +18,7 @@
import com.ruoyi.order.dto.*;
import com.ruoyi.order.vo.ChargingOrderListInfoVO;
import com.ruoyi.order.vo.EndOfChargePageInfo;
+import org.springframework.web.bind.annotation.RequestBody;
import java.time.LocalDate;
import java.util.List;
@@ -212,7 +213,7 @@
Map<String, Object> countLocalCar();
- Long getAver(List<Integer> siteIds);
+ Double getAver(List<Integer> siteIds);
List<Map<String, Object>> getLevelEvaluate(List<Integer> siteIds);
@@ -231,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);
@@ -266,4 +267,16 @@
* @return
*/
EndOfChargePageInfo getEndOfChargePageInfo(String id);
+
+ Long countNoTag();
+
+
+ /**
+ * 获取订单数据
+ * @param order
+ * @return
+ */
+ List<TChargingOrder> getChargingOrder(TChargingOrderVo order);
+
+ Long countCar(List<String> brands);
}
--
Gitblit v1.7.1