From d6a270547b46d393f3d34cccf2aaad463e441093 Mon Sep 17 00:00:00 2001
From: yangzhe123 <2824096059@qq.com>
Date: Fri, 5 Sep 2025 16:13:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E6=B0=B4=E9=87=8F=E6=95=B4=E7=BC=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StWaterRReorganizeController.java           |  2 +-
 .../gunshi/project/hsz/model/StWaterRReal.java  |  6 ++++++
 .../resources/mapper/StWaterRRealMapper.xml     | 17 +++++++++++++++--
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gunshi/project/hsz/controller/StWaterRReorganizeController.java b/src/main/java/com/gunshi/project/hsz/controller/StWaterRReorganizeController.java
index 336216c..5217597 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/StWaterRReorganizeController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/StWaterRReorganizeController.java
@@ -174,7 +174,7 @@ public class StWaterRReorganizeController {
         return R.ok(list);
     }
 
-    @Operation(summary = "供水统计")
+    @Operation(summary = "供水统计-右边四项统计")
     @PostMapping("/count")
     public R<StWaterRRVo> count(@RequestBody @Validated StWaterRReorganize stWaterRReorganize ){
         String searchType = stWaterRReorganize.getSearchType();
diff --git a/src/main/java/com/gunshi/project/hsz/model/StWaterRReal.java b/src/main/java/com/gunshi/project/hsz/model/StWaterRReal.java
index 922b98f..9eba77c 100644
--- a/src/main/java/com/gunshi/project/hsz/model/StWaterRReal.java
+++ b/src/main/java/com/gunshi/project/hsz/model/StWaterRReal.java
@@ -39,6 +39,12 @@ public class StWaterRReal implements Serializable {
         @NotBlank(message = "测站编码不能为空")
         private String stcd;
 
+        /**
+         * 测站名称
+         */
+        @TableField(exist = false)
+        private String stnm;
+
         /**
         * 时间
         */
diff --git a/src/main/resources/mapper/StWaterRRealMapper.xml b/src/main/resources/mapper/StWaterRRealMapper.xml
index e5721d5..94b2de5 100644
--- a/src/main/resources/mapper/StWaterRRealMapper.xml
+++ b/src/main/resources/mapper/StWaterRRealMapper.xml
@@ -3,11 +3,24 @@
 <mapper namespace="com.gunshi.project.hsz.mapper.StWaterRRealMapper">
 
     <select id="listRelated" resultType="com.gunshi.project.hsz.model.StWaterRReal">
-        SELECT stb.stcd, stb.sttp, t.tm, t.q, t.v
+        SELECT
+        stb.stcd,
+        stb.sttp,
+        stb.stnm,
+        t.tm,
+        t.q,
+        t.v
         FROM public.st_stbprp_b stb
-            JOIN public.st_water_r_real t ON t.stcd = stb.stcd
+        JOIN public.st_water_r_real t ON t.stcd = stb.stcd
+        JOIN (
+        SELECT stcd, MAX(tm) as max_tm
+        FROM public.st_water_r_real
+        GROUP BY stcd
+        ) latest ON t.stcd = latest.stcd AND t.tm = latest.max_tm
         <where>
             stb.sttp in ('QQ', 'PQ')
+            and stb.stcd in ('1112','1113','1114') -- 站点编码，这里到时候得改
         </where>
+
     </select>
 </mapper>