From 4c0de922c21dea1e892cce2e3c5aca6fe4988465 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 30 Oct 2023 10:23:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index d72503a8ee..580b33088e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -290,6 +290,12 @@ from bus_sales_order_vehicle bv LEFT JOIN bus_sales_order AS bso ON bv.salesOrderSid = bso.sid where (bv.borrowerSid is null or bv.borrowerSid = '') and bv.salesOrderSid = #{sale0rderSid} + union all + select if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)) as temporaryNo,concat(if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)),':',if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) < 1,'-',RIGHT(bv.linkNo, 8))) as dictValue,bv.sid dictKey + from bus_sales_order_vehicle bv + LEFT JOIN bus_sales_order AS bso ON bv.salesOrderSid = bso.sid + left join bus_sales_order_borrower bbb on bbb.sid = bv.borrowerSid + where length(bv.borrowerSid)>0 and bv.salesOrderSid = #{sale0rderSid} and bbb.state = 1 order by temporaryNo asc