From 15708fd0a1e20e21754fb68088b1e39da36da31d Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Fri, 17 Jul 2026 14:16:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=94=B5=E7=AB=99?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yfd/platform/config/MybitsPlusConfig.java |  4 +-
 .../service/impl/SdEngInfoBHServiceImpl.java  | 48 +++++++++----------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/backend/src/main/java/com/yfd/platform/config/MybitsPlusConfig.java b/backend/src/main/java/com/yfd/platform/config/MybitsPlusConfig.java
index 99d43307..eff73ed2 100644
--- a/backend/src/main/java/com/yfd/platform/config/MybitsPlusConfig.java
+++ b/backend/src/main/java/com/yfd/platform/config/MybitsPlusConfig.java
@@ -28,7 +28,9 @@ public class MybitsPlusConfig {
     public MybatisPlusInterceptor mybatisPlusInterceptor() {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
         // 添加分页拦截器，指定数据库类型为 Oracle
-        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.ORACLE));
+//        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.ORACLE));
+        // 添加分页拦截器，指定数据库类型为 Oracle
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.DM));
         return interceptor;
     }
 
diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
index 1418a713..adfb2590 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
@@ -1237,9 +1237,9 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
                 "eng.AVQ10 AS avq10, " +
                 "eng.AVQ11 AS avq11, " +
                 "eng.AVQ12 AS avq12, " +
-                "CAST(NULL AS NUMBER) AS obmxq, " +
-                "CAST(NULL AS NUMBER) AS obmnq, " +
-                "CAST(NULL AS NUMBER) AS hmxq, " +
+                "rbh.OBMXQ AS obmxq, " +
+                "rbh.OBMNQ AS obmnq, " +
+                "rbh.HMXQ AS hmxq, " +
                 "eng.DSNFQFRQ AS dsnfqfrq, " +
                 "eng.DSRCIN AS dsrcin, " +
                 "eng.CKFQFQR AS ckfqfqr, " +
@@ -1249,21 +1249,21 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
                 "eng.CKW3 AS ckw3, " +
                 "eng.AVSD AS avsd, " +
                 "eng.AVS AS avs, " +
-                "CAST(NULL AS NUMBER) AS obmxs, " +
-                "CAST(NULL AS NUMBER) AS ckflz, " +
-                "CAST(NULL AS NUMBER) AS dsflz, " +
-                "CAST(NULL AS NUMBER) AS normz, " +
-                "CAST(NULL AS NUMBER) AS uzfc, " +
+                "rbh.OBMXS AS obmxs, " +
+                "rbh.CKFLZ AS ckflz, " +
+                "rbh.DSFLZ AS dsflz, " +
+                "rbh.NORMZ AS normz, " +
+                "rbh.UZFC AS uzfc, " +
                 "eng.FSLTDZ AS fsltdz, " +
                 "eng.YDOWNZ AS ydownz, " +
-                "CAST(NULL AS NUMBER) AS ddz, " +
+                "rbh.DDZ AS ddz, " +
                 "eng.NRZAR AS nrzar, " +
                 "eng.BCKLEN AS bcklen, " +
                 "rbh.TTCP AS ttcp, " +
-                "CAST(NULL AS NUMBER) AS nmzcp, " +
-                "CAST(NULL AS VARCHAR2(255)) AS fldcpStr, " +
-                "CAST(NULL AS NUMBER) AS actcp, " +
-                "CAST(NULL AS NUMBER) AS ddcp, " +
+                "rbh.NMZCP AS nmzcp, " +
+                "null AS fldcpStr, " +
+                "rbh.ACTCP AS actcp, " +
+                "rbh.DDCP AS ddcp, " +
                 "eng.CPSC AS cpsc, " +
                 "eng.PRSC AS prsc, " +
                 "eng.RGCP AS rgcp, " +
@@ -1279,26 +1279,26 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
                 "  WHEN '9' THEN '其他' " +
                 "  ELSE NULL END AS rgcpName, " +
                 "eng.DSMXQ AS dsflzmxq, " +
-                "CAST(NULL AS NUMBER) AS dsflzxyz, " +
+                "rbh.DSFLZXYZ AS dsflzxyz, " +
                 "eng.CHMXQ AS ckflzmxq, " +
-                "CAST(NULL AS NUMBER) AS ckflzxyz, " +
-                "CAST(NULL AS NUMBER) AS ksqadjq, " +
-                "CAST(NULL AS NUMBER) AS ksqxyz, " +
+                "rbh.CKFLZXYZ AS ckflzxyz, " +
+                "rbh.KSQADJQ AS ksqadjq, " +
+                "rbh.KSQXYZ AS ksqxyz, " +
                 "eng.GEMAXRQ AS gemaxrq, " +
-                "CAST(NULL AS NUMBER) AS mxgeqxyz, " +
+                "rbh.MXGEQXYZ AS mxgeqxyz, " +
                 "eng.YRGEB AS ttpwr, " +
-                "CAST(NULL AS NUMBER) AS gncnt, " +
+                "pwr.GNCNT AS gncnt, " +
                 "eng.GNTP AS gntp, " +
-                "CAST(NULL AS NUMBER) AS grntpwr, " +
+                "pwr.GRNTPWR AS grntpwr, " +
                 "pwr.YRGE AS yrge, " +
-                "CAST(NULL AS NUMBER) AS ushr, " +
-                "CAST(NULL AS NUMBER) AS k, " +
+                "pwr.USHR AS ushr, " +
+                "pwr.K AS k, " +
                 "eng.DMTP AS dmtp, " +
                 "eng.DMCREL AS dmcrel, " +
                 "eng.MXDMHG AS mxdmhg, " +
                 "eng.DMLEN AS dmlen, " +
-                "CAST(NULL AS NUMBER) AS sgyge, " +
-                "CAST(NULL AS NUMBER) AS unyge, " +
+                "pwr.SGYGE AS sgyge, " +
+                "UNYGE AS unyge, " +
                 "eng.GAP AS gap, " +
                 "eng.DVTP AS dvtp, " +
                 "CASE eng.DVTP " +