Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-03 d70a64df5d6f7b3b8f68436bd92df8366219981b

 ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml

@@ -89,7 +89,7 @@
        </foreach>
    </select>

    <select id="selectByNumbers" resultType="com.ycl.platform.domain.vo.TMonitor">
    <select id="selectByNumbers" resultType="com.ycl.platform.domain.entity.TMonitor">
        select * from t_monitor where serial_number in
        <foreach collection="numbers" separator="," open="(" close=")" item="number">
            #{number}
@@ -508,10 +508,14 @@
               #{query.keyword} as keyword
        FROM
            t_monitor tm
                INNER JOIN t_yw_point yp ON yp.serial_number = tm.serial_number
        <where>
            <if test="query.keyword != null and query.keyword != ''">
                AND tm.name like concat('%', #{query.keyword}, '%')
            </if>
            <if test="query.startTIme != null and query.endTime != null">
                AND yp.create_time between #{query.startTime} and #{query.endTime}
            </if>
        </where>
    </select>