From e4274d098a6cb3443469142178355c9fc3b13232 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 11 Nov 2024 18:32:40 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/trunkline/vo/BillladingWaybillExportVO.java    | 9 +++++++++
 .../mapper/TrunklineBillladingWaybillMapper.xml          | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/BillladingWaybillExportVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/BillladingWaybillExportVO.java
index d311eca44..34f114f08 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/BillladingWaybillExportVO.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/BillladingWaybillExportVO.java
@@ -17,6 +17,15 @@ public class BillladingWaybillExportVO implements Serializable {
 	@ExcelProperty(value = "运单号")
 	private String waybillNo;
 
+	@ExcelProperty(value = "车牌号")
+	private String carNumber;
+
+	@ExcelProperty(value = "司机名称")
+	private String driverName;
+
+	@ExcelProperty(value = "司机电话")
+	private String driverPhone;
+
 	@ExcelProperty(value = "开单时间")
 	@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date openOrderTime;
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml
index 4c424be0a..c71b2bc87 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml
@@ -113,6 +113,9 @@
 
     <select id="findWaybillInfoListByBillladingIdExport" resultType="com.logpm.trunkline.vo.BillladingWaybillExportVO">
         select ltb.billlading_code billadingCode,
+               ltb.car_number carNumber,
+               ltb.driver_name driverName,
+               ltb.driver_phone driverPhone,
                ltbw.waybill_no waybillNo,
                lww.create_time openOrderTime,
                lww.goods_name goodsName,