From 1dbf74b9b9de0923bc44958f8208c8f47195c7d7 Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Wed, 17 Jul 2024 10:41:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=A8=E9=87=8F=E7=AB=99=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=B8=A6=E9=9B=A8=E9=87=8F=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gunshi/project/xyt/mapper/StStbprpBMapper.java   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java
index 833d177..7b3deb6 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java
@@ -20,10 +20,12 @@ public interface StStbprpBMapper extends BaseMapper<StStbprpB> {
 
     @Select("""
             <script>
-            SELECT st.*,SUM(r.drp) v FROM st_stbprp_b st
-            LEFT JOIN st_pptn_r r ON st.stcd = r.stcd
+            SELECT st.stcd,
+                   	st.stnm,
+                   	st.lgtd,
+                   	st.lttd,COALESCE ( SUM ( r.drp ), 0 ) v FROM st_stbprp_b st
+            LEFT JOIN ( SELECT stcd, drp FROM st_pptn_r WHERE tm BETWEEN #{dto.stm} AND #{dto.etm} ) r ON st.stcd = r.stcd
             WHERE st.sttp = 'PP'
-            AND r.tm BETWEEN #{dto.stm} AND #{dto.etm}
             GROUP BY st.stcd
             </script>
             """)
@@ -31,7 +33,7 @@ public interface StStbprpBMapper extends BaseMapper<StStbprpB> {
 
     @Select("""
             <script>
-            SELECT st.*,r.rz v FROM st_stbprp_b st
+            SELECT st.*,COALESCE (r.rz, 0 ) v FROM st_stbprp_b st
             LEFT JOIN st_rsvr_r_real r ON st.stcd = r.stcd
             WHERE st.sttp = 'RR'
             </script>
@@ -40,7 +42,7 @@ public interface StStbprpBMapper extends BaseMapper<StStbprpB> {
 
     @Select("""
             <script>
-            SELECT st.*,r.q v FROM st_stbprp_b st
+            SELECT st.*,COALESCE (r.q, 0 ) v FROM st_stbprp_b st
             LEFT JOIN st_water_r_real r ON st.stcd = r.stcd
             WHERE st.sttp = 'ZQ'
             </script>