Merge remote-tracking branch 'origin/master'

lyh

2025-07-02 212eb8010c66c321dcdfc617725b37885573a44e

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalInfoMapper.xml

@@ -33,26 +33,26 @@

    <select id="findByEquIdsAndMonth" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentStatisticalInfo">
        SELECT
            AVG(open_long) openLong,
            AVG(close_long) closeLong,
            AVG(wait_long) waitLong,
            AVG(process_long) processLong,
            AVG(error_long) errorLong
        AVG(open_long) openLong,
        AVG(close_long) closeLong,
        AVG(wait_long) waitLong,
        AVG(process_long) processLong,
        AVG(error_long) errorLong
        FROM
            mdc_equipment_statistical_info
        mdc_equipment_statistical_info
        WHERE
            equipment_id IN
            <foreach collection="equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
                #{ id }
            </foreach>
            AND the_date LIKE CONCAT(#{month}, '%')
        equipment_id IN
        <foreach collection="equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
            #{ id }
        </foreach>
        AND the_date LIKE CONCAT(#{month}, '%')
    </select>

    <select id="findByEquipmentAndDate" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentStatisticalInfo">
        SELECT
            *
        *
        FROM
            mdc_equipment_statistical_info
        mdc_equipment_statistical_info
        WHERE
        equipment_id IN
        <foreach collection="equipmentIdList" item="id" index="index" open="(" close=")" separator=",">