From 98bbd9d72b0cc2f512fc9c16db1605add04c7e31 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 4 Dec 2023 10:32:10 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=AF=BC=E5=87=BA=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E8=BD=A6=E7=89=8C=E5=8F=B7=E5=92=8Cvin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/pile/OrderBasicInfoController.java | 2 +- .../src/main/java/com/jsowell/pile/vo/web/OrderListVO.java | 6 ++++++ .../src/main/resources/mapper/pile/OrderBasicInfoMapper.xml | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java index db1952243..c3b893acd 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java @@ -103,7 +103,7 @@ public class OrderBasicInfoController extends BaseController { } /** - * 导出订单列表 + * 导出订单列表/订单导出 */ @PreAuthorize("@ss.hasPermi('order:order:export')") @Log(title = "订单", businessType = BusinessType.EXPORT) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java index e30260a97..2e7929449 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java @@ -99,6 +99,12 @@ public class OrderListVO { @Excel(name = "逻辑卡号") private String logicCard; + /** + * 车牌号 + */ + @Excel(name = "车牌号") + private String plateNumber; + /** * vin码 */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 0c8e5d565..0b7bc7fb9 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -174,6 +174,7 @@ t1.connector_code as connectorCode, t1.logic_card as logicCard, t1.vin_code as vinCode, + t1.plate_number as plateNumber, t1.start_mode as startMode, t1.pay_mode as payMode, t1.pay_status as payStatus, @@ -195,7 +196,7 @@ from order_basic_info t1 left join member_basic_info t2 on t1.member_id = t2.member_id and t2.del_flag = '0' join pile_station_info t3 on t1.station_id = t3.id and t3.del_flag = '0' - join order_detail t4 on t4.order_code = t1.order_code and t4.del_flag = '0' and t4.del_flag = '0' + join order_detail t4 on t4.order_code = t1.order_code and t4.del_flag = '0' left join member_transaction_record t5 on t5.order_code = t1.order_code and action_type = 'forward' and t5.del_flag = '0' where t1.del_flag = '0'