贴皮分解、贴皮管理、未排贴皮orderpage补充交付日期

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;
 }

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;
 }

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

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