From 69cbdce245731863eda1956bef28641a6fbae6f6 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 1 Mar 2024 14:20:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A1=AE=E5=AE=9A=E8=B4=B7?= =?UTF-8?q?=E6=AC=BE=E4=BA=BA=E8=8B=A5=E6=B2=A1=E6=9C=89=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E8=BD=A6=E6=9E=B6=E5=8F=B7=EF=BC=8C=E5=88=99=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E9=80=89=E5=88=B0=E8=AF=A5=E8=BD=A6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 0d75ee14e9..54f5c94c5f 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 @@ -312,13 +312,13 @@ 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 - where (bv.borrowerSid is null or bv.borrowerSid = '') and bv.salesOrderSid = #{sale0rderSid} + where (bv.borrowerSid is null or bv.borrowerSid = '') and bv.salesOrderSid = #{sale0rderSid} and length(bv.linkNo)>0 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 = 0 + where length(bv.borrowerSid)>0 and bv.salesOrderSid = #{sale0rderSid} and bbb.state = 0 and length(bv.linkNo)>0 order by temporaryNo asc