bug修改

无关风月

2025-02-12 d0b83b31dba32844fc6fe8ff84afa0d960e18de7

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

@@ -65,7 +65,7 @@

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

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

    List<Map<String, Object>> getSumByType(@Param("chargingOrderIds")List<Long> chargingOrderIds);

@@ -88,10 +88,11 @@

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

    List<Map<String, Object>> usersDay();
    List<Map<String, Object>> usersDay(@Param("statisticsQueryDto")ChargingStatisticsQueryDto statisticsQueryDto);
    List<Map<String, Object>> usersDay1();

   List<Map<String, Object>> usersByQuery(@Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);
   List<Map<String, Object>> usersByQuery1(@Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);

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

@@ -105,11 +106,11 @@

   Map<String, Object> countLocalCar();

    Long getAver(@Param("siteIds") List<Integer> siteIds);
   Double getAver(@Param("siteIds") List<Integer> siteIds);

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

    List<Map<String, Object>> countBySource(@Param("siteIds")List<Integer> siteIds);
    List<Map<String, Object>> countBySource(@Param("siteIds")List<Integer> siteIds,@Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);

   List<Map<String, Object>> equipmentUserType1(@Param("siteIds") List<Integer> siteIds, @Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);

@@ -136,4 +137,8 @@
   List<Map<String, Object>> countAllUserData();

   List<Map<String, Object>> needElec1(@Param("siteIds")List<Integer> siteIds,@Param("statisticsQueryDto")  ChargingStatisticsQueryDto statisticsQueryDto);

   Long countNoTag();

    Long countCar(@Param("brands") List<String> brands);
}