From 024afbfeb399c4d800b4fa088149d92da4d8bbbf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 26 Sep 2024 16:03:08 +0800
Subject: [PATCH] 普查统计水库柱状图数据接口支持季节查询
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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..47e6c23 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
@@ -69,6 +69,9 @@
<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 TO_NUMBER(info.project_progress) desc NULLS LAST,info.status desc
</if>
@@ -80,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>
@@ -535,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",
@@ -569,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">
@@ -586,6 +592,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