From 2461281f7bdf6a4e7a016b528280ed5ec7b9f2a2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 07 Oct 2021 14:28:15 +0800
Subject: [PATCH] 1.山洪

---
 src/main/java/org/springblade/modules/regionWeight/mapper/RegionWeightMapper.xml |  111 ++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 68 insertions(+), 43 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 1432311..2678883 100644
--- a/src/main/java/org/springblade/modules/regionWeight/mapper/RegionWeightMapper.xml
+++ b/src/main/java/org/springblade/modules/regionWeight/mapper/RegionWeightMapper.xml
@@ -88,42 +88,6 @@
                  st.STTP
     </select>
 
-    <!--流域-->
-    <select id="selectReL" resultType="java.util.HashMap">
-        SELECT cs1.STCD,
-               isnull(cs1.DRP, 0) AS DRP,
-               s.STATION_NAME,
-               sc.STATION_NAME    AS REGION_NAME,
-               s.WEIGHT,
-               s.BASIN_CODE       as 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}
-                 GROUP BY STCD
-             ) cs1
-                 INNER JOIN (SELECT STATION_CODE, STATION_NAME, WEIGHT, BASIN_CODE FROM ZHSW_BASIN_STATION) 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
-                 INNER JOIN (SELECT STATION_CODE, STATION_NAME, BASIN_CODE FROM ZHSW_BASIN_STATION) sc
-                            ON sc.STATION_CODE = s.BASIN_CODE
-        GROUP BY cs1.STCD,
-                 cs1.DRP,
-                 s.STATION_NAME,
-                 sc.STATION_NAME,
-                 s.WEIGHT,
-                 s.BASIN_CODE,
-                 st.LGTD,
-                 st.LTTD,
-                 st.STTP
-    </select>
-
     <!--个县区权重值-->
     <select id="selectWeight" resultType="java.util.HashMap">
         SELECT STATION_CODE, STATION_NAME, WEIGHT
@@ -212,11 +176,29 @@
         order by csd.dyp desc
     </select>
     <select id="selectAll" resultType="java.util.HashMap">
-        SELECT STATION_CODE AS STCD,
-               STATION_NAME AS STNM,
-               REGION_NAME  AS ADDVNM
-        FROM ZHSW_REGION_WEIGHT
-        WHERE SPARE1 != 0
+        SELECT r.STATION_CODE AS STCD,
+               r.STATION_NAME AS STNM,
+               r.REGION_NAME AS ADDVNM,
+               s.STNM,
+               s.STLC,
+               s.LTTD,
+               s.LGTD,
+               isnull(cs1.DRP, 0) as DRP
+        FROM ZHSW_REGION_WEIGHT r
+                 INNER JOIN ST_STBPRP_B s ON r.STATION_CODE = s.STCD
+                 LEFT JOIN (
+            SELECT
+                STCD,
+                SUM ( DRP ) AS DRP
+            FROM
+                ST_PPTN_R
+            WHERE
+                TM &gt; #{beginTime}
+              AND TM&lt;= #{endTime} AND STCD IN (${code})
+            GROUP BY
+                STCD
+        ) cs1 ON cs1.STCD= r.STATION_CODE
+        WHERE r.SPARE1 != 0
     </select>
 
     <select id="selectLALL" resultType="java.util.HashMap">
@@ -290,7 +272,7 @@
     </select>
 
 
-    <select id="selectCode" resultType="java.lang.String">
+   <select id="selectCode" resultType="java.lang.String">
         SELECT stuff((
             SELECT ',' + CONVERT(VARCHAR (25), STCD)
             FROM dbo.ST_STBPRP_B st
@@ -309,6 +291,16 @@
             SELECT ',' + CONVERT(VARCHAR (25), STATION_CODE)
             FROM ZHSW_REGION_WEIGHT
             WHERE SPARE1!=0 FOR XML PATH ('')),
+		1,
+		1,
+	''
+	) AS siteids
+    </select>
+    <select id="selectCodeL" resultType="java.lang.String">
+        SELECT stuff((
+            SELECT ',' + CONVERT(VARCHAR (25), STATION_CODE)
+            FROM ZHSW_BASIN_STATION
+            WHERE BASIN_CODE!=0 FOR XML PATH ('')),
 		1,
 		1,
 	''
@@ -368,7 +360,8 @@
         FROM (SELECT STCD, SUM(DRP) AS DRP
               FROM dbo.ST_PPTN_R
               WHERE TM &gt; #{beginTime}
-                AND TM &lt;= #{endTime} AND STCD IN (${code})
+                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
@@ -384,5 +377,37 @@
                  st.LTTD,
                  st.STTP
     </select>
+    <!--流域-->
+    <select id="selectReL" resultType="java.util.HashMap">
+        SELECT cs1.STCD,
+               isnull(cs1.DRP, 0) AS DRP,
+               s.STATION_NAME,
+               s.WEIGHT,
+               s.BASIN_CODE    as 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, WEIGHT, BASIN_CODE FROM ZHSW_BASIN_STATION) 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.WEIGHT,
+                 s.BASIN_CODE,
+                 st.LGTD,
+                 st.LTTD,
+                 st.STTP
+    </select>
 </mapper>
 

--
Gitblit v1.9.3