fix: 优化逻辑
This commit is contained in:
parent
28b7d003ef
commit
5cb83d039d
@ -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;
|
||||
|
||||
|
||||
@ -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, ")
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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, ")
|
||||
|
||||
Loading…
Reference in New Issue
Block a user