From 24c1d61aefa5cdfd5043aa2773062e8e281bb1ec Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sun, 05 Nov 2023 11:39:53 +0800
Subject: [PATCH] 测站类型sql修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReporttMapper.xml |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReporttMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReporttMapper.xml
index b84221a..3ac8a61 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReporttMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReporttMapper.xml
@@ -45,19 +45,20 @@
         SDR.STATION_ID,acb."cd_nm" as stationName,
         DATE_FORMAT(sdr.record_time,'%Y-%m-%d') AS record_time,
         DATE_FORMAT(sdr.record_time,'%Y-%m-%d') AS reportTime,
-        SDR.VAL,SDR.DE_VAL,SDR.DN_VAL,SDR.DU_VAL
+        SDR.VAL
     FROM SM_DB_REPORT SDR
         LEFT JOIN SJZT_MD."att_cd_base" acb    ON acb."res_cd" = sdr.reservoir_id and acb."cd" = SDR.station_id
         WHERE SDR.IS_DELETED = 0
-    <if test="vo.type != null and vo.type != ''">
-        AND SDR.TYPE = #{vo.type}
-    </if>
-    <if test="vo.startTime !=null and vo.startTime !=''">
-        AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') &gt;= DATE_FORMAT( #{vo.startTime},'%Y-%m-%d')
-    </if>
-    <if test="vo.endTime !=null and vo.endTime !=''">
-        AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') &lt;=  DATE_FORMAT(#{vo.endTime},'%Y-%m-%d')
-    </if>
+        <if test="vo.type != null and vo.type != ''">
+            AND SDR.TYPE = #{vo.type}
+            AND acb."cd_type" = #{vo.type}
+        </if>
+        <if test="vo.startTime !=null and vo.startTime !=''">
+            AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') &gt;= DATE_FORMAT( #{vo.startTime},'%Y-%m-%d')
+        </if>
+        <if test="vo.endTime !=null and vo.endTime !=''">
+            AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') &lt;=  DATE_FORMAT(#{vo.endTime},'%Y-%m-%d')
+        </if>
         <if test="vo.ch != null and vo.ch != ''">
             AND acb."ch" = #{vo.ch}
         </if>
@@ -81,6 +82,7 @@
         WHERE SDR.IS_DELETED = 0
         <if test="vo.type != null and vo.type != ''">
             AND SDR.TYPE = #{vo.type}
+            AND awcb."cd_type" = #{vo.type}
         </if>
         <if test="vo.startTime !=null and vo.startTime !=''">
             AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') &gt;= DATE_FORMAT( #{vo.startTime},'%Y-%m-%d')
@@ -109,7 +111,8 @@
         LEFT JOIN SJZT_MD."att_cd_base" acb    ON acb."res_cd" = sdr.reservoir_id and acb."cd" = SDR.station_id
         WHERE SDR.is_deleted = 0
         <if test="vo.type != null and vo.type != ''">
-            AND  TYPE = #{vo.type}
+            AND  SDR.TYPE = #{vo.type}
+            AND acb."cd_type" = #{vo.type}
         </if>
         <if test="vo.startTime !=null and vo.startTime !=''">
             AND DATE_FORMAT(sdr.record_time,'%Y-%m') &gt;=  DATE_FORMAT(#{vo.startTime} ,'%Y-%m')
@@ -142,7 +145,8 @@
         LEFT JOIN SJZT_MD."att_wy_cd_base" awcb    ON awcb."res_cd" = sdr.reservoir_id and awcb."cd" = SDR.station_id
         WHERE SDR.is_deleted = 0
         <if test="vo.type != null and vo.type != ''">
-            AND  TYPE = #{vo.type}
+            AND  SDR.TYPE = #{vo.type}
+            AND awcb."cd_type" = #{vo.type}
         </if>
         <if test="vo.startTime !=null and vo.startTime !=''">
             AND DATE_FORMAT(sdr.record_time,'%Y-%m') &gt;=  DATE_FORMAT(#{vo.startTime} ,'%Y-%m')

--
Gitblit v1.9.3