Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-21 56824b8e2732c7643bd51ab859530e0b72d30c17

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

@@ -628,6 +628,45 @@
        GROUP BY
            time
    </select>

    <select id="usersByQuery1" resultType="java.util.Map">

        SELECT
        'today' AS data_type,
        '1' as type,
        DATE_FORMAT( create_time, '%Y-%m-%d' ) AS time,
        count(DISTINCT  app_user_id) AS counts
        FROM
        t_charging_order
        WHERE
        del_flag = 0
        <if test="statisticsQueryDto.dayType ==1 ">
            AND DATE(create_time) = CURDATE()
        </if>
        <if test="statisticsQueryDto.dayType ==2 ">
            AND WEEKOFYEAR(create_time) = WEEKOFYEAR(CURDATE())
        </if>
        <if test="statisticsQueryDto.dayType ==3 ">
            AND MONTH(create_time) = MONTH(CURDATE())
        </if>
        <if test="statisticsQueryDto.dayType ==4">
            AND YEAR(create_time) = YEAR(CURDATE())
        </if>
        <if test="statisticsQueryDto.dayType ==5">
            <if test="statisticsQueryDto.startTime != null">
                AND create_time >= #{statisticsQueryDto.startTime}
            </if>
            <if test="statisticsQueryDto.endTime != null">
                AND create_time &lt;= #{statisticsQueryDto.endTime}
            </if>
        </if>
        GROUP BY
        time


    </select>


    <select id="usersByQuery" resultType="java.util.Map">

        SELECT