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

---
 src/main/java/org/springblade/modules/regionWeight/mapper/RegionWeightMapper.xml |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 58 insertions(+), 2 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 9bef9c1..f4fde0f 100644
--- a/src/main/java/org/springblade/modules/regionWeight/mapper/RegionWeightMapper.xml
+++ b/src/main/java/org/springblade/modules/regionWeight/mapper/RegionWeightMapper.xml
@@ -70,7 +70,8 @@
                st.STTP
         FROM (SELECT STCD, SUM(DRP) AS DRP
               FROM dbo.ST_PPTN_R
-              WHERE TM &gt; #{beginTime} AND TM &lt;= #{endTime}
+              WHERE TM &gt; #{beginTime}
+                AND TM &lt;= #{endTime}
               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
@@ -162,7 +163,8 @@
                  FROM dbo.ST_STBPRP_B st
                           INNER JOIN dbo.ST_ADDVCD_D ad on ad.ADDVCD = st.ADDVCD
                  WHERE st.STTP = 'PP'
-                    OR st.STTP = 'ZQ' OR st.STTP='ZZ'
+                    OR st.STTP = 'ZQ'
+                    OR st.STTP = 'ZZ'
              ) c
                  INNER JOIN (
             SELECT SUM
@@ -285,5 +287,59 @@
             GROUP BY STCD
         ) csd ON csd.STCD = c.STCD
     </select>
+
+
+    <select id="selectCode" resultType="java.lang.String">
+        SELECT stuff((
+            SELECT ',' + CONVERT(VARCHAR (25), STCD)
+            FROM dbo.ST_STBPRP_B st
+                     INNER JOIN dbo.ST_ADDVCD_D ad ON ad.ADDVCD = st.ADDVCD
+            WHERE st.STTP = 'PP'
+               OR st.STTP = 'ZQ'
+               OR st.STTP = 'ZZ' FOR XML PATH ('')),
+		1,
+		1,
+	''
+	) AS siteids
+    </select>
+
+    <select id="ss" resultType="java.util.Map">
+        SELECT c.STCD,
+               c.STNM,
+               c.STLC,
+               c.ADDVNM,
+               c.RVNM,
+               c.HNNM,
+               c.LTTD,
+               c.LGTD,
+               ISNULL(csd.dyp, 0) AS dyp
+        FROM (
+                 SELECT SUM
+                            (strd.DRP) AS dyp,
+                        STCD
+                 FROM dbo.ST_PPTN_R strd
+                 WHERE strd.TM &gt; #{beginTime}
+                   AND strd.TM &lt;= #{endTime}
+                   AND STCD IN (${code})
+                 GROUP BY STCD
+             ) csd
+                 LEFT JOIN (
+            SELECT STCD,
+                   st.STNM,
+                   st.ADDVCD,
+                   st.STLC,
+                   st.LTTD,
+                   st.LGTD,
+                   st.RVNM,
+                   st.HNNM,
+                   ad.ADDVNM
+            FROM dbo.ST_STBPRP_B st
+                     INNER JOIN dbo.ST_ADDVCD_D ad ON ad.ADDVCD = st.ADDVCD
+        ) c ON c.STCD = csd.STCD
+        WHERE c.ADDVNM != '井冈山市'
+        AND c.ADDVNM != '吉水县'
+        ORDER BY
+            csd.dyp DESC
+    </select>
 </mapper>
 

--
Gitblit v1.9.3