zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 优化逻辑

Browse Source
This commit is contained in:
tangwei 2026-05-27 16:03:13 +08:00
parent 28b7d003ef
commit 5cb83d039d
4 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/com/yfd/platform/env/wq/entity/vo/WqVmsstbprptVo.java vendored
View File

@ -12,6 +12,9 @@ public class WqVmsstbprptVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Schema(description = "基地Id")
private String baseId;
@Schema(description = "基地名称") @Schema(description = "基地名称")
private String baseName; private String baseName;

2
backend/src/main/java/com/yfd/platform/env/wq/service/impl/EnvWqDataServiceImpl.java vendored
View File

@ -209,6 +209,7 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
if (queryEngDirectly) { if (queryEngDirectly) {
sql.append("SELECT ") sql.append("SELECT ")
.append("hb.BASENAME AS baseName, ") .append("hb.BASENAME AS baseName, ")
.append("hb.BASEID AS baseID, ")
.append("eng.ENNM AS stnm, ") .append("eng.ENNM AS stnm, ")
.append("eng.ENNM AS ennm, ") .append("eng.ENNM AS ennm, ")
.append("eng.JCDT AS jcdt, ") .append("eng.JCDT AS jcdt, ")
@ -230,6 +231,7 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
} else { } else {
sql.append("SELECT ") sql.append("SELECT ")
.append("hb.BASENAME AS baseName, ") .append("hb.BASENAME AS baseName, ")
.append("hb.BASEID AS baseID, ")
.append("wq.STNM AS stnm, ") .append("wq.STNM AS stnm, ")
.append("eng.ENNM AS ennm, ") .append("eng.ENNM AS ennm, ")
.append("wq.JCDT AS jcdt, ") .append("wq.JCDT AS jcdt, ")

2
backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdWtBaseInfoVO.java vendored
View File

@ -12,6 +12,8 @@ public class SdWtBaseInfoVO implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Schema(description = "基地Id")
private String baseId;
@Schema(description = "基地名称") @Schema(description = "基地名称")
private String baseName; private String baseName;

2
backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdWtMonitorServiceImpl.java vendored
View File

@ -437,6 +437,7 @@ public class SdWtMonitorServiceImpl implements SdWtMonitorService {
if (queryEngDirectly) { if (queryEngDirectly) {
sql.append("SELECT ") sql.append("SELECT ")
.append("hb.BASENAME AS baseName, ") .append("hb.BASENAME AS baseName, ")
.append("hb.BASEID AS baseId, ")
.append("eng.ENNM AS stnm, ") .append("eng.ENNM AS stnm, ")
.append("eng.ENNM AS ennm, ") .append("eng.ENNM AS ennm, ")
.append("eng.JCDT AS jcdt, ") .append("eng.JCDT AS jcdt, ")
@ -458,6 +459,7 @@ public class SdWtMonitorServiceImpl implements SdWtMonitorService {
} else { } else {
sql.append("SELECT ") sql.append("SELECT ")
.append("hb.BASENAME AS baseName, ") .append("hb.BASENAME AS baseName, ")
.append("hb.BASEID AS baseId, ")
.append("wt.STNM AS stnm, ") .append("wt.STNM AS stnm, ")
.append("eng.ENNM AS ennm, ") .append("eng.ENNM AS ennm, ")
.append("wt.JCDT AS jcdt, ") .append("wt.JCDT AS jcdt, ")