hbwri/skjcmanager.git

			@@ -439,7 +439,9 @@
			SELECT
			arb."center_long" AS longitude,
			arb."center_lat" AS latitude,
			resCd
			resCd,
			abb."code" AS basCode,
			abb."name" AS basName
			FROM
			(
			SELECT NAG.dam_id resCd,count(*) FROM YWXT.NKY_ALARM_GET NAG GROUP BY NAG.dam_id
			@@ -449,10 +451,27 @@
			LEFT JOIN SJZT_MD."att_ad_base" county ON county."guid" = town."p_ad_code"
			LEFT JOIN SJZT_MD."att_ad_base" city ON city."guid" = county."p_ad_code"
			LEFT JOIN SJZT_MD."att_ad_base" province ON province."guid" = city."p_ad_code"

			LEFT JOIN SJZT_MD."rel_res_bas_loc" rrbl ON rrbl."res_guid" = baseAlarm.resCd
			LEFT JOIN SJZT_MD."att_bas_base" abb ON abb."code" = rrbl."bas_guid"
			LEFT JOIN SJZT_MD."att_bas_base" pabb ON abb."p_code" = pabb."code"

			WHERE 1=1
			<if test="dam.adCode != null and dam.adCode !='' ">
			AND (province."ad_code" =#{dam.adCode} or city."ad_code" = #{dam.adCode} or county."ad_code" = #{dam.adCode})
			</if>
			<if test="basCodes != null and basCodes !='' ">
			AND(
			abb."code" in
			<foreach collection="basCodes.split(',')" item="item" index="index" open="(" separator="," close=")">
			#{item}
			</foreach>
			or pabb."code" in
			<foreach collection="basCodes.split(',')" item="item" index="index" open="(" separator="," close=")">
			#{item}
			</foreach>
			)
			</if>
			</select>

			<select id="damResInfoCount" resultType="cn.gistack.sm.damSecurity.vo.DamStatisticsRes">