From 67dc13039d504c28c16f8a6667ee769b725e8551 Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Mon, 15 Jun 2026 14:48:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fp/service/impl/FpRunServiceImpl.java     | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpRunServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpRunServiceImpl.java
index deb7abe9..f94e7cfd 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpRunServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpRunServiceImpl.java
@@ -264,14 +264,14 @@ public class FpRunServiceImpl implements FpRunService {
                 stationParamMap
         );
         String rstcd = stationContext == null ? null : Convert.toStr(stationContext.get("rstcd"), null);
-        String hbrvcd = stationContext == null ? null : Convert.toStr(stationContext.get("hbrvcd"), null);
-
+//        String hbrvcd = stationContext == null ? null : Convert.toStr(stationContext.get("hbrvcd"), null);
+        String rvcd = stationContext == null ? null : Convert.toStr(stationContext.get("rvcd"), null);
         String wtrvStcd = null;
         String wqStcd = null;
-        if (StrUtil.isNotBlank(rstcd) && StrUtil.isNotBlank(hbrvcd)) {
+        if (StrUtil.isNotBlank(rstcd) && StrUtil.isNotBlank(rvcd)) {
             Map<String, Object> alongParamMap = new HashMap<>();
             alongParamMap.put("rstcd", rstcd);
-            alongParamMap.put("hbrvcd", hbrvcd);
+            alongParamMap.put("rvcd", rvcd);
             List<Map<String, Object>> alongRows = microservicDynamicSQLMapper.pageAllList(
                     null,
                     buildQgcFpRunAnalysisAlongSql(),
@@ -294,14 +294,13 @@ public class FpRunServiceImpl implements FpRunService {
         paramMap.put("startTime", StrUtil.trim(tmArr[0]));
         paramMap.put("endTime", StrUtil.trim(tmArr[1]));
         paramMap.put("rstcd", rstcd);
-        paramMap.put("hbrvcd", hbrvcd);
+        paramMap.put("hbrvcd", rvcd);
         paramMap.put("wtrvStcd", wtrvStcd);
         paramMap.put("wqStcd", wqStcd);
-
+        String sql = buildQgcFpRunAnalysisDataSql(dataSourceRequest == null ? null : dataSourceRequest.getSort());
         Page<?> page = loadOptions == null ? null : QgcQueryWrapperUtil.buildPage(loadOptions);
         List<FpRunAnalysisVo> rows = microservicDynamicSQLMapper.pageAllListWithResultType(
-                page,
-                buildQgcFpRunAnalysisDataSql(dataSourceRequest == null ? null : dataSourceRequest.getSort()),
+                page,sql,
                 paramMap,
                 FpRunAnalysisVo.class
         );
@@ -2059,7 +2058,7 @@ public class FpRunServiceImpl implements FpRunService {
     }
 
     private String buildQgcFpRunAnalysisStationSql() {
-        return "SELECT fp.RSTCD AS rstcd, eng.HBRVCD AS hbrvcd " +
+        return "SELECT fp.RSTCD AS \"rstcd\",eng.RVCD  AS \"rvcd\", eng.HBRVCD AS \"hbrvcd\" " +
                 "FROM SD_FPSS_B_H fp " +
                 "LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = fp.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 " +
                 "WHERE fp.STCD = #{map.stcd} " +
@@ -2071,7 +2070,7 @@ public class FpRunServiceImpl implements FpRunService {
                 "FROM MS_ALONG_B t1 " +
                 "INNER JOIN MS_ALONGDET_B t2 ON t1.ID = t2.ALONG_ID " +
                 "WHERE t1.CODE = 'common' " +
-                "  AND t1.RVCD = #{map.hbrvcd} " +
+                "  AND t1.RVCD = #{map.rvcd} " +
                 "  AND t2.RSTCD = #{map.rstcd} " +
                 "  AND t2.STTP IN ('WTRV', 'WQ') " +
                 "  AND NVL(t1.IS_DELETED, 0) = 0 " +