From a7872ab2c104c65656f881c395e55dedc8c0ed2a Mon Sep 17 00:00:00 2001
From: guojunyun <tingyu130@aliyun.com>
Date: Wed, 5 Nov 2025 09:56:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9Cnull?=
 =?UTF-8?q?=E5=80=BCbug=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=B8=8D=E8=AE=A1=E4=BB=B7=E8=A7=84=E5=88=99=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E3=80=81=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0=E9=99=8D=E7=BA=A7?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E3=80=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=93=E7=AE=97=E5=85=AC=E5=BC=8F=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/mysql/contract/ContractDemoteMapper.java   | 12 +++++++++++-
 .../dal/mysql/contract/ContractFormulaMapper.java  | 14 +++++++++++++-
 .../dal/mysql/contract/ContractNotMapper.java      | 12 +++++++++++-
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java
index f95b610..280b47d 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java
@@ -19,7 +19,17 @@ public interface ContractDemoteMapper extends BaseMapperX<ContractDemoteDO> {
 
     @Select({
             "<script>",
-            "select *",
+            "select ID id",
+            ", CTRT_ID contractId",
+            ", ELEM_NUM elementNumber",
+            ", ELEM_ABBR elementAbbreviation",
+            ", ELEM_NAME elementName",
+            ", GRD_UP gradeUp",
+            ", RNG_WY rangeWay",
+            ", GRD_DOWN gradeDown",
+            ", MTRL_NAME materialName",
+            ", MTRL_NUM materialNumber",
+            ", CREATE_TIME createTime",
             ", (select ctrt_name from BSE_CTRT_MAIN where id = ctrt_id) contractName",
             ", (select ctrt_ppr_num from BSE_CTRT_MAIN where id = ctrt_id) contractPaperNumber",
             "from bse_ctrt_dmot",
diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractFormulaMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractFormulaMapper.java
index 0833950..12630e8 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractFormulaMapper.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractFormulaMapper.java
@@ -19,7 +19,19 @@ public interface ContractFormulaMapper extends BaseMapperX<ContractFormulaDO> {
 
     @Select({
             "<script>",
-            "select *",
+            "select ID id",
+            ", CTRT_ID contractId",
+            ", FMU_TP formulaType",
+            ", FMU_CALT formulaCalculate",
+            ", NUM_FMU numberFormula",
+            ", MTRL_NAME materialName",
+            ", MTRL_NUM materialNumber",
+            ", DEC_PNT decimalPoint",
+            ", ELEM_NUM elementNumber",
+            ", ELEM_ABBR elementAbbreviation",
+            ", ELEM_NAME elementName",
+            ", STLM_TP settlementType",
+            ", CREATE_TIME createTime",
             ", (select ctrt_name from BSE_CTRT_MAIN where id = ctrt_id) contractName",
             ", (select ctrt_ppr_num from BSE_CTRT_MAIN where id = ctrt_id) contractPaperNumber",
             "from bse_ctrt_fmu",
diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractNotMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractNotMapper.java
index f3bc060..92f42f0 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractNotMapper.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractNotMapper.java
@@ -19,7 +19,17 @@ public interface ContractNotMapper extends BaseMapperX<ContractNotDO> {
 
     @Select({
             "<script>",
-            "select *",
+            "select ID id",
+            ", CTRT_ID contractId",
+            ", ELEM_NUM elementNumber",
+            ", ELEM_ABBR elementAbbreviation",
+            ", ELEM_NAME elementName",
+            ", GRD_UP gradeUp",
+            ", GRD_DOWN gradeDown",
+            ", RNG_WY rangeWay",
+            ", MTRL_NAME materialName",
+            ", MTRL_NUM materialNumber",
+            ", CREATE_TIME createTime",
             ", (select ctrt_name from BSE_CTRT_MAIN where id = ctrt_id) contractName",
             ", (select ctrt_ppr_num from BSE_CTRT_MAIN where id = ctrt_id) contractPaperNumber",
             "from bse_ctrt_nt",