From e47787771de211f426fa8816a3ebcb5293e53bae Mon Sep 17 00:00:00 2001 From: tangwei Date: Wed, 27 May 2026 19:13:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=B0=B4=E6=B8=A9?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yfd/platform/env/wt/entity/vo/SdWtBaseInfoVO.java | 9 +++++++++ .../env/wt/service/impl/SdWtMonitorServiceImpl.java | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdWtBaseInfoVO.java b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdWtBaseInfoVO.java index 4965624..8513915 100644 --- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdWtBaseInfoVO.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdWtBaseInfoVO.java @@ -38,6 +38,15 @@ public class SdWtBaseInfoVO implements Serializable { @Schema(description = "建成日期") private Date jcdt; + @Schema(description = "开工日期") + private Date ststdt; + + @Schema(description = "建设状态") + private String bldsttCcodeName; + + @Schema(description = "接入状态") + private String dtinName; + @Schema(description = "监测指标") private String stindx; 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 6a0467b..f3d0e5d 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 @@ -592,6 +592,7 @@ public class SdWtMonitorServiceImpl implements SdWtMonitorService { sql.append("SELECT ") .append("hb.BASENAME AS baseName, ") .append("hb.BASEID AS baseId, ") + .append("dw.SWDT AS ststdt, ") .append("hb.ORDER_INDEX AS baseStepSort, ") // .append("NVL(hbrv.ORDER_INDEX, 999999) AS rvcdStepSort, ") .append("eng.ORDER_INDEX AS rstcdStepSort, ") @@ -609,6 +610,11 @@ public class SdWtMonitorServiceImpl implements SdWtMonitorService { .append("NULL AS stCode, ") .append("NULL AS stName, ") .append("eng.DVTP AS dvtp, ") + .append("CASE WHEN NVL(dw.DTIN, 0) = 1 THEN '已接入' ELSE '未接入' END AS dtinName, ") + .append("CASE ") + .append("WHEN dw.BLDSTT_CODE IN ('1', '10', '11') THEN '已建' ") + .append("WHEN dw.BLDSTT_CODE IN ('2', '7', '8') THEN '在建' ") + .append("ELSE '未建/规划' END AS bldsttCcodeName, ") .append("eng.HBRVCD AS hbrvcd ") .append("FROM SD_DFLTKW_B_H dw ") .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = dw.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ")