From 4f92bd6a574bd0ee5694c640d9ad1e8c61eb844d Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Thu, 3 Sep 2026 09:56:02 +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

---
 .../service/impl/SdHydrobaseServiceImpl.java  |  5 ++++-
 .../fb/service/impl/FbStationServiceImpl.java |  3 +++
 .../wq/service/impl/EnvWqDataServiceImpl.java | 21 ++++++++++++++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHydrobaseServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHydrobaseServiceImpl.java
index 9669eba8..70602d4b 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHydrobaseServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHydrobaseServiceImpl.java
@@ -75,7 +75,10 @@ public class SdHydrobaseServiceImpl extends ServiceImpl<SdHydrobaseMapper, SdHyd
         if (StringUtils.hasText(basename)) {
             wrapper.like(SdHydrobase::getBasename, basename);
         }
-
+        if (adminAuthService.isCurrentManagedAdmin()) {
+            wrapper.orderByAsc(SdHydrobase::getOrderIndex);
+            return this.list(wrapper);
+        }
         Set<String> authorizedStations = getUserAuthorizedStationCodes();
 
         if (authorizedStations != null && !authorizedStations.isEmpty()) {
diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fb/service/impl/FbStationServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/fb/service/impl/FbStationServiceImpl.java
index 5309b35d..e0ac66b7 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_env/fb/service/impl/FbStationServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fb/service/impl/FbStationServiceImpl.java
@@ -53,6 +53,9 @@ public class FbStationServiceImpl implements FbStationService {
     private static final Map<String, String> FISH_RUN_FIELD_MEANING_MAP = new HashMap<>();
 
     static {
+        FISH_RUN_FIELD_MEANING_MAP.put("ID", "主键ID");
+        FISH_RUN_FIELD_MEANING_MAP.put("RPIMN_ID", "放流实施ID");
+        FISH_RUN_FIELD_MEANING_MAP.put("STCD", "电站编码");
         FISH_RUN_FIELD_MEANING_MAP.put("FTP", "鱼种类");
         FISH_RUN_FIELD_MEANING_MAP.put("FSZ", "平均长度");
         FISH_RUN_FIELD_MEANING_MAP.put("FWET", "平均体重");
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 713303a5..1ff89e86 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
@@ -1089,6 +1089,24 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
                 .append("T.CYANO AS cyano, ")
                 .append("T.WQGRD AS wqgrd, ")
                 .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 WWQTG_NAME,")
+                .append("CASE T.WQGRD " +
+                        "    WHEN '1' THEN 'Ⅰ' " +
+                        "    WHEN '2' THEN 'Ⅱ' " +
+                        "    WHEN '3' THEN 'Ⅲ' " +
+                        "    WHEN '4' THEN 'Ⅳ' " +
+                        "    WHEN '5' THEN 'Ⅴ' " +
+                        "    WHEN '6' THEN 'V' " +
+                        "    ELSE '未知' " +
+                        "END AS WQGRD_NAME,")
                 .append("T.SFDB AS sfdb, ")
                 .append("T.WQ_SFDBHN_YS AS wqSfdbhnYs, ")
                 .append("T.BASE_ID AS baseId, ")
@@ -1917,7 +1935,8 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
             case "stcd" -> "T.STCD";
             case "tm" -> "T.TM";
             case "wqgrd" -> "T.WQGRD";
-            case "wqgrdName" -> "T.WQGRD_NAME";
+            case "wqgrdName" -> "WQGRD_NAME";
+            case "wwqtgName" -> "WWQTG_NAME";
             case "ph" -> "T.PH";
             case "dox" -> "T.DOX";
             case "codmn" -> "T.CODMN";