From f93ed40140d66098504be86a08ed722895b60ac6 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 08 Sep 2021 09:44:19 +0800
Subject: [PATCH] 1.单位

---
 src/main/java/org/springblade/modules/rsvr/mapper/RsvrRMapper.xml   |    4 ++--
 src/main/java/org/springblade/modules/river/mapper/RiverRMapper.xml |    7 +++----
 2 files changed, 5 insertions(+), 6 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 164a5e6..a8756a2 100644
--- a/src/main/java/org/springblade/modules/river/mapper/RiverRMapper.xml
+++ b/src/main/java/org/springblade/modules/river/mapper/RiverRMapper.xml
@@ -34,10 +34,9 @@
                  LEFT JOIN ST_RVFCCH_B rv ON ri.STCD = rv.STCD
                  LEFT JOIN ST_STBPRP_B st ON st.STCD = ri.STCD
                  INNER JOIN ST_ADDVCD_D ad on ad.ADDVCD = st.ADDVCD
-        WHERE ri.TM &gt;= #{beginTime}
+        WHERE ri.TM &gt; #{beginTime}
           AND ri.TM &lt;= #{endTime} and ad.ADDVNM NOT LIKE '井冈山市' AND ad.ADDVNM NOT LIKE '吉水县'
-        ORDER BY
-            ri.Z DESC
+        ORDER BY ri.TM desc
     </select>
 
     <!--河道最新超警信息-->
@@ -60,7 +59,7 @@
                           INNER JOIN (SELECT ADDVCD, ADDVNM
                                       FROM dbo.ST_ADDVCD_D
                                       WHERE ADDVNM NOT LIKE '井冈山市' AND ADDVNM NOT LIKE '吉水县') c ON c.ADDVCD = s.ADDVCD
-                 WHERE A.TM &gt;= #{dateBegin24}
+                 WHERE A.TM &gt; #{dateBegin24}
                    AND A.TM &lt;= #{time}
                  GROUP BY A.STCD, s.ADDVCD
              ) cs
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 ca5fc7e..d60c83a 100644
--- a/src/main/java/org/springblade/modules/rsvr/mapper/RsvrRMapper.xml
+++ b/src/main/java/org/springblade/modules/rsvr/mapper/RsvrRMapper.xml
@@ -47,7 +47,7 @@
                               and FSLTDZ is not null) rsv ON rsv.STCD = rs.STCD
                  INNER JOIN sys_rsvr st ON st.STCD = rs.STCD
                  INNER JOIN dbo.ST_RSVRFCCH_B rst ON rst.STCD = rs.STCD
-        WHERE rs.TM &gt;= #{beginTime}
+        WHERE rs.TM &gt; #{beginTime}
           AND rs.TM &lt;= #{endTime}
         ORDER BY rs.TM DESC
     </select>
@@ -121,7 +121,7 @@
                         RANK() OVER ( partition BY STCD ORDER BY RZ DESC ) maxAgeNum,
                         RANK() OVER ( partition BY STCD ORDER BY RZ )      minAgeNum
                  FROM dbo.ST_RSVR_R
-                 WHERE TM &gt;= #{beginTime}
+                 WHERE TM &gt; #{beginTime}
                    AND TM &lt;= #{endTime}
              ) s
                  INNER JOIN dbo.ST_STBPRP_B st ON st.STCD = s.STCD

--
Gitblit v1.9.3