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-06-17 18:11:12 +08:00
parent da514b286c
commit f37cb335e7
2 changed files with 6 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/qgc_eng/eq/entity/vo/EngEqVmsstbprptVo.java
View File

@ -56,6 +56,9 @@ public class EngEqVmsstbprptVo implements Serializable {
@Schema(description = "环保数据接入状态")
private Integer dtinEnv;
@Schema(description = "接入状态")
private Integer dtin;
@Schema(description = "基地排序")
private Integer baseStepSort;

3
backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java
View File

@ -2480,6 +2480,7 @@ public class EngEqDataServiceImpl implements EngEqDataService {
"eng.BLDSTT AS bldstt, " +
"eng.BLDSTT_CODE AS bldsttCcode, " +
"eng.DTIN_ENV AS dtinEnv, " +
"eng.DTIN AS dtin, " +
"NVL(hb.ORDER_INDEX, 999999) AS baseStepSort, " +
"NVL(along.ORDER_INDEX, 999999) AS rvcdStepSort, " +
"NVL(eng.ORDER_INDEX, 999999) AS rstcdStepSort, " +
@ -2528,6 +2529,7 @@ public class EngEqDataServiceImpl implements EngEqDataService {
columns.put("prsc", "t.prsc AS prsc");
columns.put("bldstt", "t.bldstt AS bldstt");
columns.put("bldsttCcode", "t.bldsttCcode AS bldsttCcode");
columns.put("dtin", "t.dtin AS dtin");
columns.put("dtinEnv", "t.dtinEnv AS dtinEnv");
columns.put("baseStepSort", "t.baseStepSort AS baseStepSort");
columns.put("rvcdStepSort", "t.rvcdStepSort AS rvcdStepSort");
@ -4502,6 +4504,7 @@ public class EngEqDataServiceImpl implements EngEqDataService {
case "bldstt" -> "t.bldstt";
case "bldsttCcode" -> "t.bldsttCcode";
case "dtinEnv" -> "t.dtinEnv";
case "DTIN" -> "t.dtin";
case "baseStepSort" -> "NVL(t.baseStepSort, 999999)";
case "rvcdStepSort" -> "NVL(t.rvcdStepSort, 999999)";
case "rstcdStepSort" -> "NVL(t.rstcdStepSort, 999999)";