Merge remote-tracking branch 'origin/master'

xiangpei

2024-08-06 8e49eae6b1c33e0a02742af2657a1f2c0b89d95b

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

@@ -63,4 +63,33 @@
        ]]>
    </select>

    <select id="selectByTag" resultType="com.ycl.platform.domain.entity.YwPoint">
        select * from t_yw_point
        <where>
            <if test="important!=null and important!= '' ">
                and point_tag like concat('%', #{important}, '%')
            </if>
            <if test="province!=null and province!= '' ">
                and point_tag like concat('%', #{province}, '%')
            </if>
        </where>
    </select>

    <select id="export" resultType="com.ycl.platform.domain.excel.PointExport">
        SELECT
               m.name as pointName,
               m.serial_number,
               m.ip,
               yu.unit_name
        FROM
             t_yw_point yp
                 INNER JOIN t_monitor m ON yp.serial_number = m.serial_number
                 INNER JOIN t_yw_unit yu ON yu.id = yp.unit_id
        <where>
            <if test="query.pointName != null and query.pointName != ''">
                AND m.name like concat('%', #{query.pointName} ,'%')
            </if>
        </where>
    </select>

</mapper>