From 9f4315d54bfeeba093d4fe9ee74b6d0ad4af0d0a Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 19 Oct 2023 21:40:33 +0800
Subject: [PATCH] 蓄水方式查询条件调整
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/mapper/SkxsQkTjMapper.xml | 8 ++++----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/mapper/XsfsQktjMapper.xml | 8 ++++----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/vo/XsfsQktjVO.java | 5 +++++
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/mapper/SkxsQkTjMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/mapper/SkxsQkTjMapper.xml
index 7da8d4d..d04e509 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/mapper/SkxsQkTjMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/mapper/SkxsQkTjMapper.xml
@@ -26,8 +26,8 @@
left join SJZT_MD."att_ad_base" c ON b."p_ad_code" = c."guid"
left join SJZT_MD."att_ad_base" d ON c."p_ad_code" = d."guid"
where 1=1
- <if test="skxsQkTj.statisticTime!=null">
- and DATE_FORMAT(sqt."statistic_time",'%Y-%m-%d') = #{skxsQkTj.statisticTime}
+ <if test="skxsQkTj.queryTime!=null and skxsQkTj.queryTime!=''">
+ and DATE_FORMAT(sqt."statistic_time",'%Y-%m-%d') = #{skxsQkTj.queryTime}
</if>
<if test="skxsQkTj.resName!=null and skxsQkTj.resName!=''">
and sqt."res_name" like concat('%',#{skxsQkTj.resName},'%')
@@ -124,8 +124,8 @@
left join SJZT_MD."att_ad_base" c ON b."p_ad_code" = c."guid"
left join SJZT_MD."att_ad_base" d ON c."p_ad_code" = d."guid"
where 1=1
- <if test="skxsQkTj.statisticTime!=null">
- and DATE_FORMAT(sqt."statistic_time",'%Y-%m-%d') = #{skxsQkTj.statisticTime}
+ <if test="skxsQkTj.queryTime!=null and skxsQkTj.queryTime!=''">
+ and DATE_FORMAT(sqt."statistic_time",'%Y-%m-%d') = #{skxsQkTj.queryTime}
</if>
<if test="skxsQkTj.resName!=null and skxsQkTj.resName!=''">
and sqt."res_name" like concat('%',#{skxsQkTj.resName},'%')
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 bad6699..181e1b9 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
@@ -8,8 +8,8 @@
xq.*
from SJZT_ODS."xsfs_qktj" xq
where 1=1
- <if test="xsfsQktj.statisticTime!=null">
- and date_format(xq."statistic_time","%Y-%m-%d") = #{xsfsQktj.statisticTime}
+ <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 xq."ad_code" = #{xsfsQktj.adCode}
@@ -22,8 +22,8 @@
xq.*
from SJZT_ODS."xsfs_qktj" xq
where 1=1
- <if test="xsfsQktj.statisticTime!=null">
- and date_format(xq."statistic_time",'%Y-%m-%d') = #{xsfsQktj.statisticTime}
+ <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 xq."ad_code" = #{xsfsQktj.adCode}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/vo/XsfsQktjVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/vo/XsfsQktjVO.java
index 104b1e6..762ecb1 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/vo/XsfsQktjVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/vo/XsfsQktjVO.java
@@ -10,4 +10,9 @@
* 水库规模
*/
private Integer isExport;
+
+ /**
+ * 查询时间
+ */
+ private String queryTime;
}
--
Gitblit v1.9.3