From a98b1db4392c357304036e8b3cdd01646920300d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 21 Jul 2022 15:41:23 +0800
Subject: [PATCH] 1.山洪

---
 src/main/java/org/springblade/modules/rsvr/mapper/RsvrRMapper.xml |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/rsvr/mapper/RsvrRMapper.xml b/src/main/java/org/springblade/modules/rsvr/mapper/RsvrRMapper.xml
index 4f35d87..74e101b 100644
--- a/src/main/java/org/springblade/modules/rsvr/mapper/RsvrRMapper.xml
+++ b/src/main/java/org/springblade/modules/rsvr/mapper/RsvrRMapper.xml
@@ -88,7 +88,7 @@
                             GROUP BY STCD) cs4 ON cs4.STCD = rs.STCD
         WHERE rs.TM &gt; #{beginTime}
           AND rs.TM &lt;= #{endTime}
-        ORDER BY rs.TM DESC
+        ORDER BY rs.RZ DESC
     </select>
 
     <select id="selectyjcd" resultType="java.util.HashMap">
@@ -314,14 +314,16 @@
 
     <!--水库站水位流量过程接口-->
     <select id="selectRsvrLists" resultType="java.util.HashMap">
-        select * from dbo.ST_RIVER_R where STCD=#{code}
+        select rs.*,rv.WRZ from dbo.ST_RIVER_R rs
+        LEFT JOIN ( SELECT STCD, WRZ FROM dbo.ST_RVFCCH_B ) rv ON rv.STCD = rs.STCD
+        where rs.STCD=#{code}
         <if test="dateBegin!=null and dateBegin!=''">
-            AND TM &gt;=#{dateBegin}
+            AND rs.TM &gt;=#{dateBegin}
         </if>
         <if test="dateEnd!=null and dateEnd!=''">
-            and TM&lt;=#{dateEnd}
+            and rs.TM&lt;=#{dateEnd}
         </if>
-        ORDER BY TM DESC
+        ORDER BY rs.TM DESC
     </select>
 
 

--
Gitblit v1.9.3