From bc76e975aae3837eae625a2e3ffff7d02a5fc3f3 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 13 Sep 2021 17:27:24 +0800
Subject: [PATCH] 1.山洪

---
 src/main/java/org/springblade/modules/regionWeight/mapper/RegionWeightMapper.xml |   55 +++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/regionWeight/mapper/RegionWeightMapper.xml b/src/main/java/org/springblade/modules/regionWeight/mapper/RegionWeightMapper.xml
index f4fde0f..1432311 100644
--- a/src/main/java/org/springblade/modules/regionWeight/mapper/RegionWeightMapper.xml
+++ b/src/main/java/org/springblade/modules/regionWeight/mapper/RegionWeightMapper.xml
@@ -103,7 +103,7 @@
                  SELECT STCD,
                         SUM(DRP) AS DRP
                  FROM dbo.ST_PPTN_R
-                 WHERE TM &gt;= #{beginTime}
+                 WHERE TM &gt; #{beginTime}
                    AND TM &lt;= #{endTime}
                  GROUP BY STCD
              ) cs1
@@ -203,7 +203,7 @@
                        (strd.DRP) AS dyp,
                    STCD
             FROM dbo.ST_PPTN_R strd
-            WHERE strd.TM &gt;= #{beginTime}
+            WHERE strd.TM &gt; #{beginTime}
               AND strd.TM &lt;= #{endTime}
             GROUP BY STCD
         ) csd ON csd.STCD = c.STCD
@@ -249,13 +249,14 @@
                           INNER JOIN dbo.ST_ADDVCD_D ad ON ad.ADDVCD = st.ADDVCD
                  WHERE st.STTP = 'PP'
                     OR st.STTP = 'ZQ'
+                    OR st.STTP = 'ZZ'
              ) c
                  LEFT JOIN (
             SELECT SUM
                        (stro.DRP) AS drp1,
                    STCD
             FROM dbo.ST_PPTN_R stro
-            WHERE stro.TM &gt;= #{ dateBegin1 }
+            WHERE stro.TM &gt; #{ dateBegin1 }
               AND stro.TM &lt;= #{time}
             GROUP BY STCD
         ) cs1 ON cs1.STCD = c.STCD
@@ -264,7 +265,7 @@
                        (strt.DRP) AS drp3,
                    STCD
             FROM dbo.ST_PPTN_R strt
-            WHERE strt.TM &gt;= #{ dateBegin3 }
+            WHERE strt.TM &gt; #{ dateBegin3 }
               AND strt.TM &lt;= #{time}
             GROUP BY STCD
         ) cs3 ON cs3.STCD = c.STCD
@@ -273,7 +274,7 @@
                        (strx.DRP) AS drp6,
                    STCD
             FROM dbo.ST_PPTN_R strx
-            WHERE strx.TM &gt;= #{ dateBegin6 }
+            WHERE strx.TM &gt; #{ dateBegin6 }
               AND strx.TM &lt;= #{time}
             GROUP BY STCD
         ) cs6 ON cs6.STCD = c.STCD
@@ -282,7 +283,7 @@
                        (strd.DRP) AS dyp,
                    STCD
             FROM dbo.ST_PPTN_R strd
-            WHERE strd.TM &gt;= #{ times }
+            WHERE strd.TM &gt; #{ times }
               AND strd.TM &lt;= #{time}
             GROUP BY STCD
         ) csd ON csd.STCD = c.STCD
@@ -297,6 +298,17 @@
             WHERE st.STTP = 'PP'
                OR st.STTP = 'ZQ'
                OR st.STTP = 'ZZ' FOR XML PATH ('')),
+		1,
+		1,
+	''
+	) AS siteids
+    </select>
+
+    <select id="selectCodeM" resultType="java.lang.String">
+        SELECT stuff((
+            SELECT ',' + CONVERT(VARCHAR (25), STATION_CODE)
+            FROM ZHSW_REGION_WEIGHT
+            WHERE SPARE1!=0 FOR XML PATH ('')),
 		1,
 		1,
 	''
@@ -341,5 +353,36 @@
         ORDER BY
             csd.dyp DESC
     </select>
+
+    <!--最新面降雨量-->
+    <select id="selectReMs" resultType="java.util.HashMap">
+        SELECT cs1.STCD,
+               isnull(cs1.DRP, 0) as DRP,
+               s.STATION_NAME,
+               s.REGION_NAME,
+               s.WEIGHT,
+               s.REGION_CODE,
+               st.LGTD,
+               st.LTTD,
+               st.STTP
+        FROM (SELECT STCD, SUM(DRP) AS DRP
+              FROM dbo.ST_PPTN_R
+              WHERE TM &gt; #{beginTime}
+                AND TM &lt;= #{endTime} AND STCD IN (${code})
+              GROUP BY STCD) cs1
+                 INNER JOIN (SELECT STATION_CODE, STATION_NAME, REGION_NAME, WEIGHT, REGION_CODE
+                             FROM ZHSW_REGION_WEIGHT) s ON s.STATION_CODE = cs1.STCD
+                 INNER JOIN (SELECT STCD, LGTD, LTTD, STTP, ADDVCD FROM dbo.ST_STBPRP_B) st ON st.STCD = cs1.STCD
+                 INNER JOIN dbo.ST_ADDVCD_D ad ON ad.ADDVCD = st.ADDVCD
+        GROUP BY cs1.STCD,
+                 cs1.DRP,
+                 s.STATION_NAME,
+                 s.REGION_NAME,
+                 s.WEIGHT,
+                 s.REGION_CODE,
+                 st.LGTD,
+                 st.LTTD,
+                 st.STTP
+    </select>
 </mapper>
 

--
Gitblit v1.9.3