From f59b77f78c89caf284347bddaa227e35a6945629 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Thu, 13 Aug 2026 11:58:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B4=E7=9A=AE=E5=88=86=E8=A7=A3=E3=80=81?=
 =?UTF-8?q?=E8=B4=B4=E7=9A=AE=E7=AE=A1=E7=90=86=E3=80=81=E6=9C=AA=E6=8E=92?=
 =?UTF-8?q?=E8=B4=B4=E7=9A=AEorderpage=E8=A1=A5=E5=85=85=E4=BA=A4=E4=BB=98?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/veneer/vo/VeneerDecomposeOrderRespVO.java           | 4 ++++
 .../controller/admin/veneer/vo/VeneerManageOrderRespVO.java   | 3 +++
 .../main/resources/mapper/veneer/VeneerDecomposeMapper.xml    | 3 +++
 .../src/main/resources/mapper/veneer/VeneerManageMapper.xml   | 4 ++++
 4 files changed, 14 insertions(+)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/veneer/vo/VeneerDecomposeOrderRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/veneer/vo/VeneerDecomposeOrderRespVO.java
index da7cc7597..aeade9545 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/veneer/vo/VeneerDecomposeOrderRespVO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/veneer/vo/VeneerDecomposeOrderRespVO.java
@@ -47,6 +47,10 @@ public class VeneerDecomposeOrderRespVO {
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY, timezone = TIME_ZONE_DEFAULT)
     private LocalDateTime orderDate;
 
+    @Schema(description = "订单交付日期")
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY, timezone = TIME_ZONE_DEFAULT)
+    private LocalDateTime deliveryDate;
+
     @Schema(description = "子订单列表")
     private List<VeneerDecomposeOrderRespVO> child;
 }
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/veneer/vo/VeneerManageOrderRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/veneer/vo/VeneerManageOrderRespVO.java
index 9c763772e..25ddaddae 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/veneer/vo/VeneerManageOrderRespVO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/veneer/vo/VeneerManageOrderRespVO.java
@@ -42,6 +42,9 @@ public class VeneerManageOrderRespVO {
     @Schema(description = "订单日期")
     private LocalDateTime orderDate;
 
+    @Schema(description = "订单交付日期")
+    private LocalDateTime deliveryDate;
+
     @Schema(description = "子订单列表")
     private List<VeneerManageOrderRespVO> child;
 }
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/veneer/VeneerDecomposeMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/veneer/VeneerDecomposeMapper.xml
index 3f9025cfb..fb9d83d0e 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/veneer/VeneerDecomposeMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/veneer/VeneerDecomposeMapper.xml
@@ -11,6 +11,7 @@
         <result property="customer" column="customer"/>
         <result property="address" column="address"/>
         <result property="orderDate" column="orderDate"/>
+        <result property="deliveryDate" column="deliveryDate"/>
         <result property="num" column="num"/>
         <result property="area" column="area"/>
     </resultMap>
@@ -76,6 +77,7 @@
                o.customer,
                o.address,
                o.order_date AS orderDate,
+               o.delivery_date AS deliveryDate,
                o.plate_num AS num,
                o.area AS area
         FROM orders o
@@ -95,6 +97,7 @@
                o.customer,
                o.address,
                o.order_date AS orderDate,
+               o.delivery_date AS deliveryDate,
                o.plate_num AS num,
                o.area AS area
         FROM orders o
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/veneer/VeneerManageMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/veneer/VeneerManageMapper.xml
index 5e34529f3..3fdcdd157 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/veneer/VeneerManageMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/veneer/VeneerManageMapper.xml
@@ -11,6 +11,7 @@
         <result property="customer" column="customer"/>
         <result property="address" column="address"/>
         <result property="orderDate" column="orderDate"/>
+        <result property="deliveryDate" column="deliveryDate"/>
         <result property="num" column="num"/>
         <result property="area" column="area"/>
     </resultMap>
@@ -102,6 +103,7 @@
                o.customer,
                o.address,
                o.order_date AS orderDate,
+               o.delivery_date AS deliveryDate,
                o.plate_num AS num,
                o.area AS area
         FROM orders o
@@ -121,6 +123,7 @@
                o.customer,
                o.address,
                o.order_date AS orderDate,
+               o.delivery_date AS deliveryDate,
                o.plate_num AS num,
                o.area AS area
         FROM orders o
@@ -364,6 +367,7 @@
                o.customer,
                o.address,
                o.order_date AS orderDate,
+               o.delivery_date AS deliveryDate,
                o.plate_num AS num,
                o.area AS area
         FROM orders o