hbwri/skjcmanager.git

			@@ -7,10 +7,12 @@
			<result property="reservoirId" column="reservoir_id"/>
			<result property="reservoirName" column="reservoirName"/>
			<result property="type" column="type"/>
			<result property="typeLabel" column="typeLabel"/>
			<result property="content" column="content"/>
			<result property="reportTime" column="report_time"/>
			<result property="images" column="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
			<result property="videos" column="videos" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
			<result property="reportUser" column="real_name"/>

			<result property="createDept" column="create_dept"/>
			<result property="createUser" column="create_user"/>
			@@ -23,14 +25,35 @@
			</resultMap>

			<select id="selectRecordPage" resultMap="vo">
			SELECT R.*,arb."name" reservoirName FROM SM_MANAGE_PROTECT_RECORD R
			SELECT
			R.*,
			arb."name" AS reservoirName,
			U.REAL_NAME ,
			BDB.DICT_VALUE AS typeLabel
			FROM SM_MANAGE_PROTECT_RECORD R
			LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = R.reservoir_id
			LEFT JOIN BLADE_USER U ON U.ID = R.CREATE_USER
			LEFT JOIN BLADE_DICT_BIZ BDB ON BDB.DICT_KEY = R.TYPE AND BDB.CODE = 'MANAGE_PROTECT_TYPE'

			left join SJZT_MD."att_ad_base" aab on aab."guid" = arb."interior_ad_guid"
			left join SJZT_MD."att_ad_base" aa on aab."p_ad_code" = aa."ad_code"
			left join SJZT_MD."att_ad_base" ab on aa."p_ad_code" = ab."ad_code"
			left join SJZT_MD."att_ad_base" ac on ab."p_ad_code" = ac."ad_code"


			WHERE R.IS_DELETED = 0
			<if test="record.adCode != null and record.adCode != '' ">
			and (aab."ad_code" = #{record.adCode} or aa."ad_code" = #{record.adCode} or ab."ad_code" = #{record.adCode} or ac."ad_code" = #{record.adCode})
			</if>
			<if test="record.reservoirName != null and record.reservoirName !=''">
			AND arb."name" LIKE CONCAT('%',#{record.reservoirName},'%')
			</if>
			<if test="record.type !=null and record.type !=''">
			AND R.type = #{record.type}
			</if>
			<if test="record.createUser != null and record.createUser !='' ">
			AND R.CREATE_USER = #{record.createUser}
			</if>
			ORDER BY R.CREATE_TIME DESC
			</select>
			</mapper>