From 5cb83d039d23affb1418d29d77b3a6377f5725e7 Mon Sep 17 00:00:00 2001 From: tangwei Date: Wed, 27 May 2026 16:03:13 +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 --- .../java/com/yfd/platform/env/wq/entity/vo/WqVmsstbprptVo.java | 3 +++ .../yfd/platform/env/wq/service/impl/EnvWqDataServiceImpl.java | 2 ++ .../java/com/yfd/platform/env/wt/entity/vo/SdWtBaseInfoVO.java | 2 ++ .../platform/env/wt/service/impl/SdWtMonitorServiceImpl.java | 2 ++ 4 files changed, 9 insertions(+) diff --git a/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/WqVmsstbprptVo.java b/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/WqVmsstbprptVo.java index ef6d4d1..0a46130 100644 --- a/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/WqVmsstbprptVo.java +++ b/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/WqVmsstbprptVo.java @@ -12,6 +12,9 @@ public class WqVmsstbprptVo implements Serializable { private static final long serialVersionUID = 1L; + @Schema(description = "基地Id") + private String baseId; + @Schema(description = "基地名称") private String baseName; diff --git a/backend/src/main/java/com/yfd/platform/env/wq/service/impl/EnvWqDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/wq/service/impl/EnvWqDataServiceImpl.java index 59c7f5d..5819f58 100644 --- a/backend/src/main/java/com/yfd/platform/env/wq/service/impl/EnvWqDataServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/env/wq/service/impl/EnvWqDataServiceImpl.java @@ -209,6 +209,7 @@ public class EnvWqDataServiceImpl implements EnvWqDataService { if (queryEngDirectly) { sql.append("SELECT ") .append("hb.BASENAME AS baseName, ") + .append("hb.BASEID AS baseID, ") .append("eng.ENNM AS stnm, ") .append("eng.ENNM AS ennm, ") .append("eng.JCDT AS jcdt, ") @@ -230,6 +231,7 @@ public class EnvWqDataServiceImpl implements EnvWqDataService { } else { sql.append("SELECT ") .append("hb.BASENAME AS baseName, ") + .append("hb.BASEID AS baseID, ") .append("wq.STNM AS stnm, ") .append("eng.ENNM AS ennm, ") .append("wq.JCDT AS jcdt, ") 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 572b232..4100526 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 @@ -12,6 +12,8 @@ public class SdWtBaseInfoVO implements Serializable { private static final long serialVersionUID = 1L; + @Schema(description = "基地Id") + private String baseId; @Schema(description = "基地名称") private String baseName; 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 ab8de73..9061096 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 @@ -437,6 +437,7 @@ public class SdWtMonitorServiceImpl implements SdWtMonitorService { if (queryEngDirectly) { sql.append("SELECT ") .append("hb.BASENAME AS baseName, ") + .append("hb.BASEID AS baseId, ") .append("eng.ENNM AS stnm, ") .append("eng.ENNM AS ennm, ") .append("eng.JCDT AS jcdt, ") @@ -458,6 +459,7 @@ public class SdWtMonitorServiceImpl implements SdWtMonitorService { } else { sql.append("SELECT ") .append("hb.BASENAME AS baseName, ") + .append("hb.BASEID AS baseId, ") .append("wt.STNM AS stnm, ") .append("eng.ENNM AS ennm, ") .append("wt.JCDT AS jcdt, ")