merge

luodangjia

2024-11-01 ba5fb9cec090e0cf8ba32d0714f5d9a4430081b4

 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);
}