From 326a397559d9fa74fd3d93109b4cabb1b2517ccd Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Wed, 15 Jul 2026 18:01:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qgc_base/service/impl/SdEngInfoBHServiceImpl.java     | 5 ++++-
 .../qgc_eng/eq/service/impl/EngEqDataServiceImpl.java     | 8 +++++---
 .../yfd/platform/qgc_env/wt/mapper/AlongListMapper.java   | 6 +++---
 .../qgc_env/wte/service/impl/WeFishServiceImpl.java       | 2 +-
 4 files changed, 13 insertions(+), 8 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 317936e8..7e34245e 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
@@ -1081,7 +1081,7 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
                 "t.DTIN AS dtin, " +
                 "t.DTIN_TM AS dtinTm, " +
                 "t.BLDSTT_CODE AS bldsttCode, " +
-                "CASE WHEN t.BLDSTT_CODE =2 THEN '已建' WHEN t.BLDSTT_CODE =1 THEN '在建' ELSE '未建/规划' END AS bldsttCcodeName, " +
+                "CASE WHEN t.BLDSTT_CODE = 2 THEN '已建' WHEN t.BLDSTT_CODE = 1 THEN '在建' ELSE '未建/规划' END AS bldsttCcodeName, " +
                 "t.INTRODUCE AS introduce, " +
                 "t.LOGO AS logo, " +
                 "t.INFFILE AS inffile, " +
@@ -1095,6 +1095,9 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
                 "t.WDDT AS wddt, " +
                 "t.ORDER_INDEX AS orderIndex, " +
                 "t.REMARK AS remark, " +
+                "t.STINDX AS stindx, " +
+                "t.COENVW_STATE AS coenvwState, " +
+                "CASE t.DVTP WHEN '1' THEN '堤坝式' WHEN '2' THEN '引水式' WHEN '3' THEN '混合式' ELSE '未知' END AS dvtpName, " +
                 "t.VLSR AS vlsr, " +
                 "t.VLSR_TM AS vlsrTm, " +
                 "t.RECORD_USER AS recordUser, " +
diff --git a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java
index 646f80d9..c0a8d4e5 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java
@@ -3396,8 +3396,8 @@ public class EngEqDataServiceImpl implements EngEqDataService {
                 "eng.DTIN AS dtin, " +
                 "NVL(hb.ORDER_INDEX, 999999) AS baseStepSort, " +
                 "NVL(along.ORDER_INDEX, 999999) AS rvcdStepSort, " +
-                "NVL(eng.ORDER_INDEX, 999999) AS rstcdStepSort, " +
-                "NVL(eng.ORDER_INDEX, 999999) AS siteStepSort " +
+                "NVL(c.SORT, 999999) AS rstcdStepSort, " +
+                "NVL(d.SORT, 999999) AS siteStepSort " +
                 "FROM SD_ENGINFO_B_H eng " +
                 "INNER JOIN SD_PWR_B_H pbh ON pbh.STCD= eng.STCD " +
                 "LEFT JOIN SD_RSVRFCCH_B_H rbh ON rbh.STCD= eng.STCD " +
@@ -3406,7 +3406,9 @@ public class EngEqDataServiceImpl implements EngEqDataService {
                 "LEFT JOIN SD_ADDVCD_DIC ad ON ad.ADDVCD = eng.ADDVCD" +
                 " AND NVL(hbrv.IS_DELETED, 0) = 0 AND NVL(hbrv.ENABLED, 1) = 1 " +
                 "LEFT JOIN SD_RVCD_DIC rv ON rv.RVCD = eng.RVCD " +
-                "LEFT JOIN MS_ALONG_B along ON along.RVCD = eng.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
+                "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 c.SORT,d.BASEID,d.RVCD,c.STCD from MS_ALONGDET_B c inner join MS_ALONG_B d on c.ALONG_ID=d.ID    where c.IS_DELETED=0 and d.IS_DELETED=0 and d.CODE='common') c on c.BASEID=eng.BASE_ID and c.stcd=eng.STCD \n" +
+                "LEFT JOIN (select c.SORT,d.BASEID,d.RVCD,c.STCD from MS_ALONGDET_B c inner join MS_ALONG_B d on c.ALONG_ID=d.ID      where c.IS_DELETED=0 and d.IS_DELETED=0 and d.CODE='common') d on d.BASEID=eng.BASE_ID and d.stcd=eng.STCD "+
                 "WHERE NVL(eng.IS_DELETED, 0) = 0";
     }
 
diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/AlongListMapper.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/AlongListMapper.java
index 0fd45a09..2be4b3e0 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/AlongListMapper.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/AlongListMapper.java
@@ -62,7 +62,7 @@ public interface AlongListMapper extends BaseMapper<SdAlongVO> {
             "      and MAB.RVCD=#{rvcd} " +
             "    </if>" +
             "    <if test='baseId != null and baseId != \"\"'>" +
-            "      and MAB.RVCD in (select HBRVCD from SD_HBRV_DIC where IS_DELETED=0 and ENABLED=1 and BASEID=#{baseId}) " +
+            "      and MAB.BASEID in (select BASEID from SD_HYDROBASE where IS_DELETED=0 and ENABLED=1 and BASEID=#{baseId}) " +
             "    </if>" +
             "  union all " +
             "  select " +
@@ -93,7 +93,7 @@ public interface AlongListMapper extends BaseMapper<SdAlongVO> {
             "      and MAB.RVCD=#{rvcd} " +
             "    </if>" +
             "    <if test='baseId != null and baseId != \"\"'>" +
-            "      and MAB.RVCD in (select HBRVCD from SD_HBRV_DIC where IS_DELETED=0 and ENABLED=1 and BASEID=#{baseId}) " +
+            "      and MAB.BASEID in (select BASEID from SD_HYDROBASE where IS_DELETED=0 and ENABLED=1 and BASEID=#{baseId}) " +
             "    </if>" +
             ") T order by rvcdSort asc, sort asc" +
             "</script>")
@@ -117,7 +117,7 @@ public interface AlongListMapper extends BaseMapper<SdAlongVO> {
             "and MAB.RVCD=#{rvcd} " +
             "</if>" +
             "<if test='baseId != null and baseId != \"\"'>" +
-            "and MAB.RVCD in (select HBRVCD from SD_HBRV_DIC where IS_DELETED=0 and ENABLED=1 and BASEID=#{baseId}) " +
+            "and MAB.BASEID in (select BASEID from SD_HYDROBASE where IS_DELETED=0 and ENABLED=1 and BASEID=#{baseId}) " +
             "</if>" +
             "order by MAB.ORDER_INDEX asc, SAD.SORT asc, SWR.TM desc" +
             ") where ROWNUM=1" +
diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java
index 9a89714f..b6da77f2 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java
@@ -1923,7 +1923,7 @@ public class WeFishServiceImpl implements WeFishService {
                                       List<String> rstcdList,
                                       Map<String, Object> paramMap) {
         StringBuilder sql = new StringBuilder();
-        sql.append("SELECT t.HBRVCD AS hbrvcd, t.YR AS yr ")
+        sql.append("SELECT t.BASE_ID AS hbrvcd, t.YR AS yr ")
                 .append("FROM (")
                 .append("SELECT section.HBRVCD, section.RSTCD, section.BASE_ID, TO_CHAR(we.TM, 'yyyy') AS yr ")
                 .append("FROM SD_WE_B_H section ")