Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

无关风月

2025-03-16 91df8c9b3dac121493b03c9ce1890953c1879603

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java

@@ -146,15 +146,15 @@

   Map<String, Object> countAll(LocalDate sixBefore,List<Integer> siteIds);

    List<Map<String, Object>> getSumByType(List<Long> chargingOrderIds);
    List<Map<String, Object>> getSumByType(LocalDate start,LocalDate end);

   List<Map<String, Object>> getDateData(List<Long> chargingOrderIds);
   List<Map<String, Object>> getDateData(LocalDate start,LocalDate end);

   List<Map<String, Object>> getWeekData(List<Long> chargingOrderIds);
   List<Map<String, Object>> getWeekData(LocalDate start,LocalDate end);

   List<Map<String, Object>> getMonthData(List<Long> chargingOrderIds);
   List<Map<String, Object>> getMonthData(LocalDate start,LocalDate end);

   List<Map<String, Object>> getYearData(List<Long> chargingOrderIds);
   List<Map<String, Object>> getYearData(LocalDate start,LocalDate end);

    ChargingOrderTimeVO chargingList(ChargingListQuery dto);

@@ -190,7 +190,7 @@
    */
   void excelEndCharge(String orderCode);

   List<Map<String, Object>> getByDate(List<Long> chargingOrderIds);
   List<Map<String, Object>> getByDate(LocalDate start,LocalDate end);

   List<Map<String, Object>> queryPower(List<Integer> siteIds);