hbwri/skjcmanager.git

			@@ -66,6 +66,9 @@
			#{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.projectSort == null">
			ORDER BY info.status desc ,info.project_progress desc NULLS LAST
			</if>
			@@ -179,6 +182,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 +359,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
			@@ -377,6 +385,9 @@
			<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>
			<select id="queryStepByProject1" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">