From b5709ca7313183f6f1d4ad3be405bc5fd2c24a3b Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Sat, 21 Sep 2024 11:58:57 +0800
Subject: [PATCH] 湖北水库:水库分页新增名称过滤

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
index fa38d0e..ec5828e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
@@ -80,16 +80,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>
 
@@ -586,6 +586,9 @@
         <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>

--
Gitblit v1.9.3