Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-10 951cd384e7b81eb7686e303f77992340cc91e6d1

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java

@@ -65,19 +65,46 @@

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

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

    List<Map<String, BigDecimal>> getSumByType(@Param("chargingOrderIds")List<Long> chargingOrderIds);
    List<Map<String, Object>> getSumByType(@Param("chargingOrderIds")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);

   List<ChargingOrderListVO> chargingList(@Param("pageInfo")PageInfo<ChargingOrderListVO> pageInfo, @Param("req") ChargingListQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2, @Param("endTime1")String endTime1, @Param("endTime2")String endTime2);
   List<ChargingOrderListVO> chargingListNoPage( @Param("req")ChargingListQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2, @Param("endTime1")String endTime1, @Param("endTime2")String endTime2);

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

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

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