From d8786c8c3b5084bdad9ef318d056d81579e622f0 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 30 九月 2024 11:11:04 +0800
Subject: [PATCH] 合并

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java
index b86d8b1..71c3b12 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java
@@ -86,17 +86,18 @@
 
 	Map<String, Object> queryPowerLevel(@Param("siteIds") List<Integer> siteIds,@Param("statisticsQueryDto")  ChargingStatisticsQueryDto statisticsQueryDto);
 
-    List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds);
+    List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(@Param("siteIds")List<Integer> siteIds);
 
     List<Map<String, Object>> usersDay();
+    List<Map<String, Object>> usersDay1();
 
-	List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto);
+	List<Map<String, Object>> usersByQuery(@Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);
 
     List<Map<String, Object>> getUserTagCount();
 
 	List<Map<String, Object>> getVipCount();
 
-    List<Map<String, Object>> unitConsumption(ChargingStatisticsQueryDto statisticsQueryDto);
+    List<Map<String, Object>> unitConsumption(@Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);
 
     List<Map<String, Object>> carUserMethod();
 
@@ -104,11 +105,11 @@
 
 	Map<String, Object> countLocalCar();
 
-    Long getAver(List<Integer> siteIds);
+    Long getAver(@Param("siteIds") List<Integer> siteIds);
 
-	List<Map<String, Object>> getLevelEvaluate(List<Integer> siteIds);
+	List<Map<String, Object>> getLevelEvaluate(@Param("siteIds")List<Integer> siteIds);
 
-    List<Map<String, Object>> countBySource(List<Integer> siteIds);
+    List<Map<String, Object>> countBySource(@Param("siteIds")List<Integer> siteIds);
 
 	List<Map<String, Object>> equipmentUserType1(@Param("siteIds") List<Integer> siteIds, @Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);
 
@@ -133,4 +134,6 @@
 	List<Map<String, Object>> getchargingCapacity(@Param("siteIds")List<Integer> siteIds,@Param("statisticsQueryDto") ChargingDetailQueryDto statisticsQueryDto);
 
 	List<Map<String, Object>> countAllUserData();
+
+	List<Map<String, Object>> needElec1(@Param("siteIds")List<Integer> siteIds,@Param("statisticsQueryDto")  ChargingStatisticsQueryDto statisticsQueryDto);
 }

--
Gitblit v1.7.1