From d0a9f89f3281329eea9fbdf9e27a91e8a33d3599 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 13 Mar 2024 15:14:17 +0800
Subject: [PATCH] 蓄水量日报显示区级数据
---
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztods/vo/XsfsQktjVO.java | 2 ++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/mapper/XsfsQktjMapper.xml | 20 ++++++++++++++++----
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztods/vo/XsfsQktjVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztods/vo/XsfsQktjVO.java
index 373ef52..871a7d0 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztods/vo/XsfsQktjVO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztods/vo/XsfsQktjVO.java
@@ -25,4 +25,6 @@
* 行政区名称 值如 420100000000
*/
private String typeValue;
+
+ private String adGrad;
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/mapper/XsfsQktjMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/mapper/XsfsQktjMapper.xml
index 56990b3..804fefc 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/mapper/XsfsQktjMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/mapper/XsfsQktjMapper.xml
@@ -12,9 +12,16 @@
<if test="xsfsQktj.queryTime!=null and xsfsQktj.queryTime!=''">
and date_format(xq."statistic_time",'%Y-%m-%d') = #{xsfsQktj.queryTime}
</if>
- <if test="xsfsQktj.adCode!=null and xsfsQktj.adCode!='' ">
- AND a."p_ad_code" = #{xsfsQktj.adCode}
+
+ <if test="xsfsQktj.adGrad!=null and xsfsQktj.adGrad ==3 ">
+ and a."guid" = #{xsfsQktj.adCode}
</if>
+ <if test="xsfsQktj.adGrad == null">
+ <if test="xsfsQktj.adCode!=null and xsfsQktj.adCode!=''">
+ and a."p_ad_code" = #{xsfsQktj.adCode}
+ </if>
+ </if>
+
</select>
<!--按行政区统计-->
@@ -27,8 +34,13 @@
<if test="xsfsQktj.queryTime!=null and xsfsQktj.queryTime!=''">
and date_format(xq."statistic_time",'%Y-%m-%d') = #{xsfsQktj.queryTime}
</if>
- <if test="xsfsQktj.adCode!=null and xsfsQktj.adCode!=''">
- and aab."p_ad_code" = #{xsfsQktj.adCode}
+ <if test="xsfsQktj.adGrad!=null and xsfsQktj.adGrad ==3 ">
+ and aab."guid" = #{xsfsQktj.adCode}
+ </if>
+ <if test="xsfsQktj.adGrad == null">
+ <if test="xsfsQktj.adCode!=null and xsfsQktj.adCode!=''">
+ and aab."p_ad_code" = #{xsfsQktj.adCode}
+ </if>
</if>
order by "ad_code"
</select>
--
Gitblit v1.9.3