From 108adcd1b8875fad4c84349bf5674d8e2d66940d Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Thu, 28 Nov 2024 15:21:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E6=B5=81?=
 =?UTF-8?q?=E8=BD=AC=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/order/domain/OrderDetailDto.java  | 18 ++++++++++++++++++
 .../mapper/material/order/OrderInfoMapper.xml  |  8 +++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
index d0b4c11..cf9a5b7 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
@@ -66,4 +66,22 @@ public class OrderDetailDto {
     @ApiModelProperty(value = "修改日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
+
+    @ApiModelProperty(value = "出库人")
+    private String preOutboundUser;
+
+    @ApiModelProperty(value = "出库时间")
+    private String preOutboundTime;
+
+    @ApiModelProperty(value = "收货人")
+    private String takeOverUser;
+
+    @ApiModelProperty(value = "收货时间")
+    private String takeOverTime;
+
+    @ApiModelProperty(value = "租赁结束操作人")
+    private String rentOverUser;
+
+    @ApiModelProperty(value = "租赁结束时间")
+    private String rentOverTime;
 }
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
index d5117db..d39a420 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
@@ -125,7 +125,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             hh.num,
             hh.costs,
             hh.rent_begin_time,
-            hh.rent_end_time
+            hh.rent_end_time,
+            hh.pre_outbound_user,
+            hh.pre_outbound_time,
+            hh.take_over_user,
+            hh.take_over_time,
+            hh.rent_over_user,
+            hh.rent_over_time
         FROM
             ma_order_details hh
                 LEFT JOIN ma_order_info moi ON hh.order_id = moi.order_id