From f37cb335e7835323e88a88fabb3499ebe655fec8 Mon Sep 17 00:00:00 2001 From: tangwei Date: Wed, 17 Jun 2026 18:11:12 +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 --- .../yfd/platform/qgc_eng/eq/entity/vo/EngEqVmsstbprptVo.java | 3 +++ .../platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/entity/vo/EngEqVmsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/entity/vo/EngEqVmsstbprptVo.java index 04a7d016..e3a444c1 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/entity/vo/EngEqVmsstbprptVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/entity/vo/EngEqVmsstbprptVo.java @@ -56,6 +56,9 @@ public class EngEqVmsstbprptVo implements Serializable { @Schema(description = "环保数据接入状态") private Integer dtinEnv; + @Schema(description = "接入状态") + private Integer dtin; + @Schema(description = "基地排序") private Integer baseStepSort; diff --git a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java index 4b3fb30a..b227a998 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java @@ -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)";