大屏fix

longz

2026-07-25 750266a16d1b55fc9ba95008ac611e24a18dda72

大屏fix

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

@@ -173,7 +173,7 @@

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

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


 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

@@ -6310,7 +6310,9 @@

    @Override
    public List<LargeChargingPowerVo> getLargeScreenChargingPower(List<Integer> siteIds, LocalDateTime startTime, LocalDateTime endTime) {
        return this.baseMapper.getLargeScreenChargingPower(siteIds, startTime, endTime);
        String siteIdsCsv = siteIds == null ? null : siteIds.stream()
                .map(String::valueOf).collect(Collectors.joining(","));
        return this.baseMapper.getLargeScreenChargingPower(siteIdsCsv, startTime, endTime);
    }

    @Override

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml

@@ -468,7 +468,7 @@
                      AND charging_order.status = 5
                      AND charging_order.recharge_payment_status = 2
                      AND charging_order.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
                      AND charging_order.create_time &lt; DATE_ADD(DATE_FORMAT(CURDATE(), '%Y-%m-01'), INTERVAL 1 MONTH)
                      AND charging_order.create_time &lt;= NOW()
                    <if test="siteIds != null and siteIds.size() > 0">
                        AND charging_order.site_id IN
                        <foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
@@ -2909,11 +2909,8 @@
        WHERE del_flag = 0
          AND create_time &gt;= #{startTime}
          AND create_time &lt; #{endTime}
        <if test="siteIds != null and siteIds.size() > 0">
            AND site_id IN
            <foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
                #{siteId}
            </foreach>
        <if test="siteIdsCsv != null and siteIdsCsv != ''">
            AND site_id IN (${siteIdsCsv})
        </if>
        GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')
        ORDER BY time