hbwri/skjcmanager.git

湖北水库项目

summary
reflog
commits
tree
docs
forks
compare

Merge remote-tracking branch 'origin/jtdev' into jtdev

2024-12-05 a33aff6493853c79dc13515cbfa651b38ee39d5f

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml

@@ -92,7 +92,7 @@
            and dria."county_cd" = #{dto.adCode}
        </if>
        <if test="dto.othRegCd != null and dto.othRegCd !=''">
            and dria."oth_reg_cd" = #{dto.othRegCd}
            and dria."oth_reg_cd" like CONCAT(CONCAT('%', #{dto.othRegCd}), '%')
        </if>
       <if test="dto.projectSort == null">
            ORDER BY TO_NUMBER(info.project_progress) desc NULLS LAST,info.status desc

			@@ -92,7 +92,7 @@
			and dria."county_cd" = #{dto.adCode}
			</if>
			<if test="dto.othRegCd != null and dto.othRegCd !=''">
			and dria."oth_reg_cd" = #{dto.othRegCd}
			and dria."oth_reg_cd" like CONCAT(CONCAT('%', #{dto.othRegCd}), '%')
			</if>
			<if test="dto.projectSort == null">
			ORDER BY TO_NUMBER(info.project_progress) desc NULLS LAST,info.status desc