From 71ad7f4b0f3b5da3c9c7f4e8b5866e0140c8469a Mon Sep 17 00:00:00 2001 From: tangwei Date: Thu, 28 May 2026 17:00:34 +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 --- .../platform/env/fh/service/impl/FhHabitatServiceImpl.java | 4 ++-- .../platform/env/wt/service/impl/SdWtMonitorServiceImpl.java | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/env/fh/service/impl/FhHabitatServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/fh/service/impl/FhHabitatServiceImpl.java index 276b5e16..c38646c6 100644 --- a/backend/src/main/java/com/yfd/platform/env/fh/service/impl/FhHabitatServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/env/fh/service/impl/FhHabitatServiceImpl.java @@ -1148,8 +1148,8 @@ public class FhHabitatServiceImpl implements FhHabitatService { .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = wt.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ") .append("LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = NVL(fh.BASE_ID, eng.BASE_ID) AND NVL(hb.IS_DELETED, 0) = 0 ") .append("WHERE NVL(wt.IS_DELETED, 0) = 0 ") - .append("AND wt.STTP = 'WTRV' ") - .append("AND wt.FHSTCD IS NOT NULL "); + .append("AND wt.STTP = 'WTRV' "); +// .append("AND wt.FHSTCD IS NOT NULL "); } sql.append(") t WHERE 1 = 1 "); return sql.toString(); diff --git a/backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdWtMonitorServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdWtMonitorServiceImpl.java index 75e6fcfc..c7e7112d 100644 --- a/backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdWtMonitorServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdWtMonitorServiceImpl.java @@ -645,6 +645,11 @@ public class SdWtMonitorServiceImpl implements SdWtMonitorService { .append("sttp.FULL_PATH AS sttpFullPath, ") .append("wt.STCD AS stcd, ") .append("wt.RSTCD AS rstcd, ") + .append("CASE ") + .append("WHEN wt.BLDSTT_CODE IN ('1', '10', '11') THEN '已建' ") + .append("WHEN wt.BLDSTT_CODE IN ('2', '7', '8') THEN '在建' ") + .append("ELSE '未建/规划' END AS bldsttCcodeName, ") + .append("wt.BLDSTT_CODE AS bldsttCcode, ") .append("NULL AS stCode, ") .append("NULL AS stName, ") .append("eng.DVTP AS dvtp, ")