各类修复

longz

2026-07-29 45109a672b4946a059bac111d3a61a87e1886274

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

@@ -93,7 +93,11 @@

    List<ChargingOrderGroup> chargingOrderGroup(@Param("chargingPercentProvinceDto")ChargingPercentProvinceDto chargingPercentProvinceDto);

    List<SixChargingDto> charge(@Param("sixBefore")LocalDate sixBefore,@Param("siteIds") List<Integer> siteIds, @Param("partnerView") Boolean partnerView);
    List<SixChargingDto> chargePartner(@Param("sixBefore") String sixBefore, @Param("siteIds") List<Integer> siteIds);

    List<SixChargingDto> chargeSettlement(@Param("sixBefore") String sixBefore, @Param("siteIds") List<Integer> siteIds);

    List<SixChargingDto> chargeCurrentMonth(@Param("siteIdsCsv") String siteIdsCsv);

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

@@ -173,9 +177,17 @@

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

    List<LargeChargingPowerVo> getLargeScreenChargingPower(@Param("siteIdsCsv") String siteIdsCsv,
                                                           @Param("startTime") LocalDateTime startTime,
                                                           @Param("endTime") LocalDateTime endTime);
    SixChargingDto getLargeScreenSettlementIncome(@Param("siteIdsCsv") String siteIdsCsv,
                                                  @Param("startTime") String startTime,
                                                  @Param("endTime") String endTime);

    SixChargingDto getLargeScreenCurrentMonthIncome(@Param("siteIdsCsv") String siteIdsCsv,
                                                    @Param("startTime") String startTime,
                                                    @Param("endTime") String endTime);

    Map<String, Object> getLargeScreenChargingPower(@Param("siteIdsCsv") String siteIdsCsv,
                                                    @Param("startTime") String startTime,
                                                    @Param("endTime") String endTime);


   List<Map<String, Object>> getHourType(@Param("siteIds")List<Integer> siteIds, @Param("statisticsQueryDto")ChargingDetailQueryDto statisticsQueryDto);
@@ -240,7 +252,11 @@
    * @param endTime
    */
   List<Map<String, Object>> getChargingSettlementBill(@Param("startTime") String startTime, @Param("endTime") String endTime,
                                          @Param("dateType") Integer dateType);
                                                      @Param("dateType") Integer dateType);

   List<Map<String, Object>> queryChargingBillIncome(@Param("billingCycles") List<String> billingCycles,
                                                     @Param("dateType") Integer dateType,
                                                     @Param("siteIds") List<Integer> siteIds);


   /**