Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-10 951cd384e7b81eb7686e303f77992340cc91e6d1

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

@@ -118,17 +118,17 @@

   List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore);

   Map<String, BigDecimal> countAll(LocalDate sixBefore);
   Map<String, Object> countAll(LocalDate sixBefore);

    List<Map<String, BigDecimal>> getSumByType(List<Long> chargingOrderIds);
    List<Map<String, Object>> getSumByType(List<Long> chargingOrderIds);

   List<Map<String, BigDecimal>> getDateData(List<Long> chargingOrderIds);
   List<Map<String, Object>> getDateData(List<Long> chargingOrderIds);

   List<Map<String, BigDecimal>> getWeekData(List<Long> chargingOrderIds);
   List<Map<String, Object>> getWeekData(List<Long> chargingOrderIds);

   List<Map<String, BigDecimal>> getMonthData(List<Long> chargingOrderIds);
   List<Map<String, Object>> getMonthData(List<Long> chargingOrderIds);

   List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds);
   List<Map<String, Object>> getYearData(List<Long> chargingOrderIds);

    ChargingOrderTimeVO chargingList(ChargingListQuery dto);

@@ -157,6 +157,35 @@
    */
   void excelEndCharge(String orderCode);

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

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

   Map<String, Object> qureryPowerLevel(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);

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

   List<Map<String, Object>> usersDay();

   List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto);


   List<Map<String, Object>> getUserTagCount();

    List<Map<String, Object>> getVipCount();

    List<Map<String, Object>> unitConsumption(ChargingStatisticsQueryDto statisticsQueryDto);

   List<Map<String, Object>> carUserMethod();

   List<Map<String, Object>> carUserBrand();

   Map<String, Object> countLocalCar();

    Long getAver(List<Integer> siteIds);

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


   /**
    * 根据车牌号和开始时间查询充电数据