From 7722d9782d843c2f36c5a94d3a295251c025b37b Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 12 Oct 2021 10:08:44 +0800
Subject: [PATCH] 1.山洪

---
 src/main/java/org/springblade/modules/river/mapper/RiverRMapper.xml |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/river/mapper/RiverRMapper.xml b/src/main/java/org/springblade/modules/river/mapper/RiverRMapper.xml
index 2774ac8..c128e8c 100644
--- a/src/main/java/org/springblade/modules/river/mapper/RiverRMapper.xml
+++ b/src/main/java/org/springblade/modules/river/mapper/RiverRMapper.xml
@@ -91,7 +91,7 @@
     <!--河道自定义预警测试接口-->
     <select id="selecthdcs" resultType="java.util.HashMap">
         SELECT cs.STCD,
-               cs.TM,
+               cs1.TM,
                cs1.Z,
                cs1.Q,
                cs2.STNM,
@@ -103,7 +103,6 @@
                cs4.minZ
         FROM (
                  SELECT A.STCD,
-                        MAX(A.TM) TM,
                         s.ADDVCD
                  FROM (SELECT STCD, TM, Z, Q
                        FROM dbo.ST_RIVER_R
@@ -124,7 +123,6 @@
                             FROM dbo.ST_RIVER_R
                             WHERE TM &gt; #{beginTime}
                               AND TM &lt;= #{endTime}) cs1 ON cs.STCD = cs1.STCD
-            AND cs.TM = cs1.TM
                  INNER JOIN (SELECT STCD, STNM, LTTD, LGTD, ADDVCD, STTP
                              FROM dbo.ST_STBPRP_B
                              WHERE STTP = 'ZZ'
@@ -142,7 +140,7 @@
                                AND TM &lt;= #{endTime}
                              GROUP BY STCD) cs4 ON cs4.STCD = cs.STCD
         GROUP BY cs.STCD,
-                 cs.TM,
+                 cs1.TM,
                  cs1.Z,
                  cs2.STNM,
                  ad.ADDVNM,
@@ -151,7 +149,7 @@
                  cs1.Q,
                  rv.WRZ,
                  cs3.maxZ,
-                 cs4.minZ
+                 cs4.minZ ORDER BY cs1.Z desc
     </select>
 
     <!--河道最新超警信息-->

--
Gitblit v1.9.3