From b1bdb4cf6605bc0dc5338635a68913cac52cff23 Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Fri, 10 Jul 2026 08:53:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=94=9A=E7=82=B9?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SdEngInfoBHServiceImpl.java         |  5 +++--
 .../wq/service/impl/EnvWqDataServiceImpl.java        | 12 +++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

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 99adaddd..ab376ac5 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
@@ -2851,9 +2851,9 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
                 .append("t.LGTD AS lgtd, ")
                 .append("t.LTTD AS lttd, ")
                 .append("t.AVQ AS avq, ")
-                .append("t.YRGEB AS ttpwr, ")
+                .append("p.TTPWR AS ttpwr, ")
                 .append("t.FSLTDZ AS normz, ")
-                .append("t.YRGEB AS yrge, ")
+                .append("p.YRGE AS yrge, ")
                 .append("t.BASE_ID AS baseId, ")
                 .append("t.JCDT AS jcdt, ")
                 .append("t.ADDVCD_NAME AS addvcdName, ")
@@ -2882,6 +2882,7 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
                 .append("  WHEN t.PRSC IN ('3') THEN 2 ")
                 .append("  END AS endInstalledType ")
                 .append("FROM SD_ENGINFO_B_H t ")
+                .append("LEFT JOIN SD_PWR_B_H p ON t.STCD = p.STCD AND NVL(p.IS_DELETED, 0) = 0  ")
                 .append("LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = t.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 ")
                 .append("LEFT JOIN MS_ALONG_B along ON along.RVCD = t.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 ")
                 .append("LEFT JOIN ( ")
diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wq/service/impl/EnvWqDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wq/service/impl/EnvWqDataServiceImpl.java
index f127ca7c..fdb01940 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_env/wq/service/impl/EnvWqDataServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wq/service/impl/EnvWqDataServiceImpl.java
@@ -4577,6 +4577,15 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
                 .append("t.ELEV AS dtmel, ")
                 .append("t.STLC AS stlc, ")
                 .append("t.WWQTG AS wwqtg, ")
+                .append("CASE t.WWQTG " +
+                        "    WHEN '1' THEN 'Ⅰ' " +
+                        "    WHEN '2' THEN 'Ⅱ' " +
+                        "    WHEN '3' THEN 'Ⅲ' " +
+                        "    WHEN '4' THEN 'Ⅳ' " +
+                        "    WHEN '5' THEN 'Ⅴ' " +
+                        "    WHEN '6' THEN 'V' " +
+                        "    ELSE '未知' " +
+                        "END AS wwqtgName,")
                 .append("t.DTIN_TYPE AS dtinType, ")
                 .append("t.RSTCD AS rstcd, ")
                 .append("t.FHSTCD AS fhstcd, ")
@@ -4651,6 +4660,7 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
                 if (wqData != null) {
                     anchorPointVo.setTm(wqData.getTm());
                     anchorPointVo.setWqGrd(wqData.getWqgrd());
+                    anchorPointVo.setWqGrdName(wqData.getWqgrdName());
                     anchorPointVo.setSfdb(wqData.getSfdb());
                     anchorPointVo.setWtmp(wqData.getWtmp());
                     anchorPointVo.setPh(wqData.getPh());
@@ -4732,7 +4742,7 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
                     .map(s -> "'" + s + "'")
                     .collect(Collectors.joining(","));
 
-            String wqDataSql = "SELECT STCD, TM, WQGRD, SFDB, WTMP, PH, DOX, CODMN, CODCR, BOD5, NH3N, TP, TN, CU, ZN, F, SE, ARS, HG, CD, CR6, PB, CN, VLPH, OIL, LAS, S2, FCG, CL, SO4, NO3, THRD, COND, FE, MN, AL, CHLA, CLARITY, TU, CYANO, TOD " +
+            String wqDataSql = "SELECT STCD, TM, WQGRD,CASE WQGRD WHEN '1' THEN 'Ⅰ' WHEN '2' THEN 'Ⅱ' WHEN '3' THEN 'Ⅲ' WHEN '4' THEN 'Ⅳ' WHEN '5' THEN 'Ⅴ' WHEN '6' THEN 'V' ELSE '未知' END AS wqgrdName, SFDB, WTMP, PH, DOX, CODMN, CODCR, BOD5, NH3N, TP, TN, CU, ZN, F, SE, ARS, HG, CD, CR6, PB, CN, VLPH, OIL, LAS, S2, FCG, CL, SO4, NO3, THRD, COND, FE, MN, AL, CHLA, CLARITY, TU, CYANO, TOD " +
                     "FROM ( " +
                     "    SELECT t.*, ROW_NUMBER() OVER (PARTITION BY t.STCD ORDER BY t.TM DESC) AS rn " +
                     "    FROM SD_WQ_R t " +