zgyw.git - Gitblit

			@@ -51,10 +51,6 @@
			<result column="column_value" property="columnValue"/>
			</resultMap>

			<select id="selectData" resultType="com.ycl.platform.base.BaseSelect">

			</select>

			<select id="page" resultMap="pageMap">
			SELECT
			typ.id,
			@@ -80,6 +76,7 @@
			LEFT JOIN t_yw_unit tyu ON typ.unit_id = tyu.id AND tyu.deleted = 0
			LEFT JOIN sys_dept sd ON typ.dept_id = sd.dept_id AND sd.del_flag = 0
			<where>
			typ.examine_status = 1
			<if test="query.pointName != null and query.pointName != ''">
			AND typ.point_name like concat('%', #{query.pointName}, '%')
			</if>
			@@ -94,9 +91,9 @@
			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="pointName != null and pointName != ''">
			and dcv.column_value like concat('%', #{pointName}, '%')
			</if>
			<!-- <if test="pointName != null and pointName != ''">-->
			<!-- and dcv.column_value like concat('%', #{pointName}, '%')-->
			<!-- </if>-->
			</select>

			<select id="dataCenterPage" resultType="com.ycl.platform.domain.vo.PointDetailVO">
			@@ -232,12 +229,13 @@
			CASE WHEN yp.province_tag = 0 THEN '否' ELSE '是' END AS provinceTagString,
			CASE WHEN yp.important_tag = 0 THEN '否' ELSE '是' END AS importantTagString,
			CASE WHEN yp.important_command_image_tag = 0 THEN '否' ELSE '是' END AS importantCommandImageTagString,
			CASE WHEN yp.dept_tag = 0 THEN '否' ELSE '是' END AS deptTag
			CASE WHEN yp.dept_tag = 0 THEN '否' ELSE '是' END AS deptTagString
			FROM
			t_yw_point yp
			INNER JOIN t_monitor m ON yp.serial_number = m.serial_number
			LEFT JOIN t_yw_unit yu ON yu.id = yp.unit_id
			<where>
			yp.examine_status = 1
			<if test="query.pointName != null and query.pointName != ''">
			AND m.name like concat('%', #{query.pointName} ,'%')
			</if>