From ecd6803a0e2fa1d14a2c7f3a9cc41da79c816463 Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Fri, 17 Jul 2026 14:31:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=94=B5=E7=AB=99?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=98=B2=E6=B4=AA=E6=89=A9=E5=AE=B9=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=80=BC=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SdEngInfoBHServiceImpl.java  | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
index adfb2590..3b2674fb 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
@@ -1261,7 +1261,7 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
                 "eng.BCKLEN AS bcklen, " +
                 "rbh.TTCP AS ttcp, " +
                 "rbh.NMZCP AS nmzcp, " +
-                "null AS fldcpStr, " +
+                "b.VAL AS fldcpStr, " +
                 "rbh.ACTCP AS actcp, " +
                 "rbh.DDCP AS ddcp, " +
                 "eng.CPSC AS cpsc, " +
@@ -1327,6 +1327,33 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
                 "LEFT JOIN SD_HYCD_DIC topHy ON topHy.HYCD = eng.TOP_HYCD AND NVL(topHy.IS_DELETED, 0) = 0 AND NVL(topHy.ENABLED, 1) = 1 " +
                 "LEFT JOIN SD_PWR_B_H pwr ON pwr.STCD = eng.STCD AND NVL(pwr.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN SD_RSVRFCCH_B_H rbh ON rbh.STCD = eng.STCD  " +
+                "LEFT JOIN (   SELECT STCD\n" +
+                "             , MAX(CASE WHEN RN = 1 THEN TM END)                AS TM\n" +
+                "             , MAX(CASE WHEN RN = 1 THEN VAL END)               AS VAL\n" +
+                "             , MAX(VLSR)                                        AS VLSR\n" +
+                "             , MAX(VLSR_TM)                                     AS VLSR_TM\n" +
+                "             , LISTAGG('起始时间' || TO_CHAR(TM, 'YYYY-MM-DD') || '（' || VAL || '）' ||\n" +
+                "                       CASE WHEN VLSR IS NOT NULL THEN '来源' || VLSR ELSE '' END ||\n" +
+                "                       CASE WHEN VLSR_TM IS NOT NULL THEN '，来源时间' || TO_CHAR(VLSR_TM, 'YYYY-MM-DD') ELSE '' END,\n" +
+                "                       CHR(10)) WITHIN GROUP (ORDER BY TM DESC) AS ALL_VAL\n" +
+                "        FROM ( SELECT STCD\n" +
+                "                    , TM\n" +
+                "                    , MAX(VLSR)                                                       AS VLSR\n" +
+                "                    , MAX(VLSR_TM)                                                    AS VLSR_TM\n" +
+                "                    , LISTAGG(\n" +
+                "                    SUBSTR(BGMD, 0, 2) || '月' || SUBSTR(BGMD, 3, 2) || '日' || '~' || SUBSTR(EDMD, 0, 2) || '月' ||\n" +
+                "                    SUBSTR(EDMD, 3, 2) || '日' || '限值为' ||\n" +
+                "                    (CASE WHEN FLDCPMN IS NOT NULL THEN (DECODE(SUBSTR(FLDCPMN, 1, 1), '.', '0' || FLDCPMN, FLDCPMN) ||\n" +
+                "                                                         '~' || DECODE(SUBSTR(FLDCP, 1, 1), '.', '0' || FLDCP, FLDCP))\n" +
+                "                          ELSE TO_CHAR(FLDCP) END), '，') WITHIN GROUP (ORDER BY BGMD) AS VAL\n" +
+                "                    , ROW_NUMBER() OVER (PARTITION BY STCD ORDER BY TM DESC)             RN\n" +
+                "               FROM SD_RSVRFSR_B\n" +
+                "               WHERE BGMD IS NOT NULL\n" +
+                "                 AND EDMD IS NOT NULL\n" +
+                "                 AND FLDCPMN IS NOT NULL\n" +
+                "                 AND FLDCPMN > 0\n" +
+                "               GROUP BY STCD, TM ) temp\n" +
+                "        GROUP BY STCD) b ON b.STCD = eng.STCD  " +
                 "LEFT JOIN MS_ALONG_B along ON along.BASEID = eng.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN ( " +
                 "   SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +