资产设备分页bug

xiangpei

2024-08-20 954192cde1386ebd4a6135f659eccd89323f922d

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

@@ -488,23 +488,29 @@
               tm.camera_dept,
               tm.hybm,
               tm.lxbm,
               dc.prop_name,
               dc.label_value,
               dcv.column_value
               't_monitor' as tableName,
               #{query.keyword} as keyword
        FROM
            t_monitor tm
                LEFT JOIN t_dynamic_column_value dcv ON tm.id = dcv.ref_id
                LEFT JOIN t_dynamic_column dc ON dc.id = dcv.dynamic_column_id AND dc.table_name = #{query.tableName}
        <where>
            <if test="query.keyword != null and query.keyword != ''">
                AND (tm.name like concat('%', #{query.keyword}, '%') OR dcv.column_value like concat('%', #{query.keyword}, '%'))
                AND tm.name like concat('%', #{query.keyword}, '%')
            </if>
        </where>
    </select>

    <delete id="deleteAll">
        delete from t_monitor
    </delete>
    <select id="getDyColumns" resultMap="dynamicColumnMap">
        SELECT
               *
        FROM
             t_dynamic_column_value dcv
                 LEFT JOIN t_dynamic_column dc ON dc.id = dcv.dynamic_column_id AND dc.table_name = #{tableName}
        WHERE
            dcv.ref_id = #{id}
            <if test="keyword != null and keyword != ''">
                and dcv.column_value like concat('%', #{keyword}, '%')
            </if>
    </select>

    <resultMap id="dyMap" type="com.ycl.platform.domain.vo.TMonitorVO">
        <id column="id" property="id"/>
@@ -537,7 +543,7 @@
        <result column="camera_dept" property="cameraDept"/>
        <result column="hybm" property="hybm"/>
        <result column="lxbm" property="lxbm"/>
        <collection property="dynamicColumnList" ofType="com.ycl.platform.domain.vo.DynamicColumnVO" resultMap="dynamicColumnMap"/>
        <collection property="dynamicColumnList" select="getDyColumns" column="{id=id,tableName=tableName,keyword=keyword}" ofType="com.ycl.platform.domain.vo.DynamicColumnVO"/>
    </resultMap>

    <resultMap id="dynamicColumnMap" type="com.ycl.platform.domain.vo.DynamicColumnVO">
@@ -546,4 +552,8 @@
        <result column="column_value" property="columnValue"/>
    </resultMap>


    <delete id="deleteAll">
        delete from t_monitor
    </delete>
</mapper>