From 39caebba35fc84824f5cd51d189fe322d5145803 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 09 Nov 2021 16:15:14 +0800
Subject: [PATCH] 1.山洪

---
 src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml b/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml
index 0c6ae3c..1fcb5e0 100644
--- a/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml
+++ b/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml
@@ -562,7 +562,9 @@
                sm.river,
                sm.addvnm,
                st.LGTD,
-               st.LTTD
+               st.LTTD,
+               st.HNNM,
+               cs2.minz
         FROM (
                  SELECT A.STCD,
                         MAX(A.TM) TM
@@ -575,7 +577,11 @@
                  INNER JOIN (SELECT stcd, yjsw, stname, river, addvnm
                              FROM sys_smallriver
                              GROUP BY stcd, yjsw, stname, river, addvnm) sm ON sm.stcd = cs1.STCD
-                 INNER JOIN (SELECT LGTD, LTTD, STCD FROM ST_STBPRP_B) st ON st.STCD = cs1.STCD
+                 INNER JOIN (SELECT LGTD, LTTD, STCD,HNNM FROM ST_STBPRP_B) st ON st.STCD = cs1.STCD
+                 INNER JOIN (SELECT MIN(Z) AS minz, STCD
+                             FROM dbo.ST_RIVER_R
+                             where TM &gt; #{begintime24} AND TM &lt;= #{time}
+                             GROUP BY STCD) cs2 ON cs.STCD = cs2.STCD
     </select>
     <!--大江大河-->
     <select id="selctbgriver" resultType="java.util.Map">
@@ -587,7 +593,9 @@
                sm.river,
                sm.addvnm,
                st.LGTD,
-               st.LTTD
+               st.LTTD,
+               st.HNNM,
+               cs2.minz
         FROM (
                  SELECT A.STCD,
                         MAX(A.TM) TM
@@ -600,7 +608,11 @@
                  INNER JOIN (SELECT stcd, yjsw, stname, river, addvnm
                              FROM sys_bigriver
                              GROUP BY stcd, yjsw, stname, river, addvnm) sm ON sm.stcd = cs1.STCD
-                 INNER JOIN (SELECT LGTD, LTTD, STCD FROM ST_STBPRP_B) st ON st.STCD = cs1.STCD
+                 INNER JOIN (SELECT LGTD, LTTD, STCD, HNNM FROM ST_STBPRP_B) st ON st.STCD = cs1.STCD
+                 INNER JOIN (SELECT MIN(Z) AS minz, STCD
+                             FROM dbo.ST_RIVER_R
+                             where TM &gt; #{begintime24} AND TM &lt;= #{time}
+                             GROUP BY STCD) cs2 ON cs.STCD = cs2.STCD
     </select>
 
 
@@ -676,7 +688,7 @@
         ) cs ON cs.cenconding = a.STCD
                  LEFT JOIN (
             SELECT stcd, soilval
-            FROM sys_soleval
+            FROM sys_soleval where datediff(day,stime, #{stime}) = 0
         ) so ON so.stcd = a.STCD
     </select>
     <!--山洪2小时预警-->
@@ -737,7 +749,7 @@
         ) cs ON cs.cenconding = a.STCD
                  LEFT JOIN (
             SELECT stcd, soilval
-            FROM sys_soleval
+            FROM sys_soleval where datediff(day,stime, #{stime}) = 0
         ) so ON so.stcd = a.STCD
     </select>
     <select id="MountainTr" resultMap="mountainrainResultMapcInfo">
@@ -797,7 +809,7 @@
         ) cs ON cs.cenconding = a.STCD
                  LEFT JOIN (
             SELECT stcd, soilval
-            FROM sys_soleval
+            FROM sys_soleval where datediff(day,stime, #{stime}) = 0
         ) so ON so.stcd = a.STCD
     </select>
 
@@ -912,6 +924,6 @@
                st.LTTD
         FROM sys_soleval so
                  INNER JOIN dbo.ST_STBPRP_B st ON so.stcd = st.STCD
-        where datediff(day, #{stime}, getdate()) = 0
+        where datediff(day,stime, #{stime}) = 0
     </select>
 </mapper>

--
Gitblit v1.9.3