Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4

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

@@ -91,5 +91,38 @@
            start_time
    </select>

    <!--查询数量-->
    <select id="findAlarmCount" resultType="java.lang.Integer">
        SELECT
            COUNT(*)
        FROM
            mdc_equipment_running_section
        <where>
            AND status = '22'
            AND alarm = #{ alarmCode }
            AND (start_time &lt;= #{ endDate } AND end_time &gt;= #{ startDate })
            AND equipment_id = #{ equipmentId }
        </where>
    </select>

    <!--根据日期查询数量-->
    <select id="findAlarmCountByDate" resultType="java.lang.Integer">
        SELECT
            COUNT(*)
        FROM
            mdc_equipment_running_section
        <where>
            AND status = '22'
            AND alarm = #{ vo.alarmCode }
            AND (start_time &lt;= #{ endDate } AND end_time &gt;= #{ startDate })
            <if test="vo.equipmentIdList != null and vo.equipmentIdList.size() > 0 ">
                AND equipment_id IN
                <foreach collection="vo.equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
                    #{ id }
                </foreach>
            </if>
        </where>
    </select>


</mapper>