From f20611265f7d34fd4fbcdfdaff6cb9cccd0b25fc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 21 Jun 2024 11:53:21 +0800
Subject: [PATCH] 湖北水库：施工：项目查询过滤无效修复、根据角色查询用户

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml |   14 +-------------
 1 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml
index 2e66200..160d2b8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml
@@ -67,7 +67,7 @@
         <if test="vo.endTime!=null and vo.endTime!=''">
             and tb."check_date" &lt;= #{vo.endTime}
         </if>
-
+        order by CAST(city_code AS number) asc,CAST(county_code AS number) asc,CAST(guid AS number) desc
     </select>
 
     <resultMap id="dto" type="cn.gistack.sm.sjztmd.dto.TbProjectDTO">
@@ -133,16 +133,13 @@
             aab."ad_name" adName,
             paab."guid" padCode,
             paab."ad_name" padName,
-
             tps.curMonthActualFund,
             project.totalActualFund,
-
             ifNull(resNum,0) resNum,
             ifNull(bigNum,0) bigNum,
             ifNull(midNum,0) midNum,
             ifNull(smallOneNum,0) smallOneNum,
             ifNull(smallTwoNum,0) smallTwoNum,
-
             dykeLength,
             levelOneLength,
             levelTwoLength,
@@ -176,7 +173,6 @@
             SELECT
                 aab."guid",
                 aab."ad_name",
-
                 SUM(CASE WHEN trd."dyke_guid" is not null then trd.dangerLength else 0 END) as dykeLength,
                 SUM(CASE WHEN trd."dyke_level" = '1级' THEN trd.dangerLength ELSE 0 END) AS levelOneLength,
                 SUM(CASE WHEN trd."dyke_level" = '2级' THEN trd.dangerLength ELSE 0 END) AS levelTwoLength,
@@ -218,8 +214,6 @@
                                 SUM(CASE WHEN (tdi."danger_length") THEN tdi."danger_length" ELSE 0 END) AS dangerLength
                             from sjzt_md."tb_dyke_investigation" tdi
                             where 1=1
-
-
                              <if test="params.tbYear != null and params.tbYear != ''">
                                  AND  tdi."tb_year" = #{params.tbYear}
                             </if>
@@ -235,7 +229,6 @@
             )trd on ((trd.countyCode = aab."guid") or (trd.cityCode = aab."guid") or (trd.provinceCode = aab."guid"))
             group by aab."guid",aab."ad_name"
         )dyke on dyke."guid" = aab."guid"
-
         left join (
             SELECT
                 aab."guid",
@@ -248,20 +241,17 @@
                 tb."county_code" countyCode,
                 province."guid" provinceCode,
                 tps."actual_fund"
-
                 from sjzt_md."tb_project" tb
                 LEFT JOIN SJZT_MD."tb_project_schedule" tps on tps."tb_project_id" = tb."guid"
                 LEFT JOIN YWXT."att_ad_base" province ON province."ad_code" = tb."city_code"
             )tb on ((tb.countyCode = aab."guid") or (tb.cityCode = aab."guid") or (tb.provinceCode = aab."guid"))
             group by aab."guid",aab."ad_name"
         ) project on project."guid" = aab."guid"
-
         left join (
             SELECT
             aab."guid",
             aab."ad_name",
             tb."actual_fund" curMonthActualFund
-
             FROM YWXT."att_ad_base" aab
             LEFT JOIN (
                 select
@@ -269,7 +259,6 @@
                 tb."county_code" countyCode,
                 province."guid" provinceCode,
                 tps."actual_fund"
-
                 from sjzt_md."tb_project" tb
                 LEFT JOIN SJZT_MD."tb_project_schedule" tps on tps."tb_project_id" = tb."guid"
                 LEFT JOIN YWXT."att_ad_base" province ON province."ad_code" = tb."city_code"
@@ -283,7 +272,6 @@
                   </if>
             )tb on ((tb.countyCode = aab."guid") or (tb.cityCode = aab."guid") or (tb.provinceCode = aab."guid"))
         ) tps on tps."guid" = aab."guid"
-
         left join ywxt."att_ad_base" paab on paab."guid" = aab."p_ad_code"
         where
             1=1

--
Gitblit v1.9.3