hbwri/skjcmanager.git

			@@ -66,8 +66,14 @@
			#{id}
			</foreach>)
			</if>
			<if test="dto.deptId != null and dto.deptId !=''">
			and (info.control_unit = #{dto.deptId} or info.construction_unit = #{dto.deptId})
			</if>
			<if test="dto.adCode != null and dto.adCode !=''">
			and dria."county_cd" = #{dto.adCode}
			</if>
			<if test="dto.projectSort == null">
			ORDER BY info.status desc ,info.project_progress desc NULLS LAST
			ORDER BY TO_NUMBER(info.project_progress) desc NULLS LAST,info.status desc
			</if>
			<!--
			<if test="dto.projectSort ==1">
			@@ -77,16 +83,16 @@
			ORDER BY info.sk_id asc
			</if>-->
			<if test="dto.projectSort != null and dto.projectSort ==3">
			ORDER BY info.surface_progress desc NULLS LAST
			ORDER BY TO_NUMBER(SUBSTR(info.surface_progress, 1, LENGTH(info.surface_progress) - 1)) desc NULLS LAST
			</if>
			<if test="dto.projectSort != null and dto.projectSort ==4">
			ORDER BY info.video_progress desc NULLS LAST
			ORDER BY TO_NUMBER(SUBSTR(info.video_progress, 1, LENGTH(info.video_progress) - 1)) desc NULLS LAST
			</if>
			<if test="dto.projectSort != null and dto.projectSort ==5">
			ORDER BY info.trans_progress desc NULLS LAST
			ORDER BY TO_NUMBER(SUBSTR(info.trans_progress, 1, LENGTH(info.trans_progress) - 1)) desc NULLS LAST
			</if>
			<if test="dto.projectSort != null and dto.projectSort ==6">
			ORDER BY info.seepage_progress desc NULLS LAST
			ORDER BY TO_NUMBER(SUBSTR(info.seepage_progress , 1, LENGTH(info.seepage_progress ) - 1)) desc NULLS LAST
			</if>
			</select>

			@@ -127,6 +133,7 @@
			re.resubmit
			FROM
			ywxt.sg_project_info pro
			LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = pro.sk_id
			LEFT JOIN ywxt.sg_device d ON pro.id = d.program_id
			LEFT JOIN YWXT."BLADE_DICT_BIZ" AS dict ON d.device_type = dict.DICT_KEY AND dict.CODE = 'SG_DEVICE_TYPE'
			LEFT JOIN YWXT."BLADE_DICT_BIZ" Pdict on dict.parent_id = Pdict.id
			@@ -156,6 +163,7 @@
			<if test="dto.buildStage != null and dto.buildStage != ''">
			and pro.build_stage like CONCAT(CONCAT('%',#{dto.buildStage}),'%')
			</if>
			<include refid="queryBySgCodeS"></include>
			ORDER BY pro.status desc ,pro.project_progress desc

			</select>
			@@ -179,6 +187,9 @@
			</if>
			<if test="dto.buildStage != null and dto.buildStage != ''">
			and pro.build_stage like CONCAT(CONCAT('%',#{dto.buildStage}),'%')
			</if>
			<if test="dto.deptId != null and dto.deptId !=''">
			and (pro.control_unit = #{dto.deptId} or pro.construction_unit = #{dto.deptId})
			</if>
			ORDER BY pro.project_progress desc NULLS LAST
			</select>
			@@ -353,7 +364,9 @@
			dria."county_cd" AS countyCode,
			att."guid" AS cityCode,
			ad."ad_code" AS provinceCode,
			pro.project_progress
			pro.project_progress,
			pro.control_unit,
			pro.construction_unit
			FROM
			ywxt.sg_project_info pro
			LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = pro.sk_id
			@@ -376,6 +389,9 @@
			</if>
			<if test="dto.buildStage != null and dto.buildStage != ''">
			and pro.build_stage like CONCAT(CONCAT('%',#{dto.buildStage}),'%')
			</if>
			<if test="dto.deptId != null and dto.deptId !=''">
			and (pro.control_unit = #{dto.deptId} or pro.construction_unit = #{dto.deptId})
			</if>
			order by pro.project_progress desc NULLS LAST
			</select>
			@@ -434,7 +450,10 @@
			LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = pro.sk_id
			LEFT JOIN YWXT."att_ad_base" att ON att."ad_code" = dria."city_cd"
			LEFT JOIN YWXT."att_ad_base" ad ON att."p_ad_code" = ad."ad_code"
			LEFT JOIN YWXT."att_ad_base" aad ON aad."ad_code" = ad."p_ad_code") pro
			LEFT JOIN YWXT."att_ad_base" aad ON aad."ad_code" = ad."p_ad_code"
			where 1=1
			<include refid="queryBySgCodeS"></include>
			) pro
			LEFT JOIN YWXT."att_ad_base" a ON (
			( pro.countyCode = a."guid" )
			OR ( pro.cityCode = a."guid" )
			@@ -463,6 +482,28 @@
			</if>
			ORDER BY pro.projectStatus desc ,pro.project_progress desc
			</select>

			<sql id="queryBySgCodeS">
			<if test="dto.sgCodeS != null and dto.sgCodeS.size > 0">
			and (dria."province_cd" in
			<foreach collection="dto.sgCodeS" item="id" separator="," open="(" close=")">
			#{id}
			</foreach>
			or dria."city_cd" in
			<foreach collection="dto.sgCodeS" item="id" separator="," open="(" close=")">
			#{id}
			</foreach>
			or dria."county_cd" in
			<foreach collection="dto.sgCodeS" item="id" separator="," open="(" close=")">
			#{id}
			</foreach>
			or dria."town_cd" in
			<foreach collection="dto.sgCodeS" item="id" separator="," open="(" close=")">
			#{id}
			</foreach>)
			</if>
			</sql>

			<select id="selectVOById" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">
			select * from ywxt.sg_project_info pro where pro.id = #{proframId}
			</select>
			@@ -497,7 +538,7 @@
			</select>
			<select id="projectTree" resultType="cn.gistack.sm.sg.VO.SgProjectTreeVO">
			SELECT
			<!-- TOP 200 -->
			<!-- TOP 200 -->
			info.id,
			info.lot,
			dria."province_nm",
			@@ -531,6 +572,9 @@
			#{id}
			</foreach>)
			</if>
			<if test="dto.adCode != null and dto.adCode !=''">
			and dria."county_cd" = #{dto.adCode}
			</if>
			</select>
			<select id="getUserS" resultType="java.lang.String">

			@@ -543,4 +587,14 @@


			</select>
			<select id="resList" resultType="cn.gistack.sm.sg.VO.ResVO">
			select dria.* from "SJZT_DW"."dim_res_info_a" dria where 1=1
			<if test="dto.adCode != null and dto.adCode != ''">
			and (dria."province_cd" = #{dto.adCode} or dria."city_cd" = #{dto.adCode} or dria."county_cd" = #{dto.adCode})
			</if>
			<if test="dto.skName != null and dto.skName != ''">
			and dria."res_nm" like CONCAT(CONCAT('%', #{dto.skName}), '%')
			</if>
			<include refid="queryBySgCodeS"></include>
			</select>
			</mapper>