Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 1 year ago
parent
commit
674a8d9c63
  1. 23
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml

23
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml

@ -58,17 +58,18 @@
t1.saleDate, t1.saleDate,
t1.handoverState, t1.handoverState,
t1.handoverDate, t1.handoverDate,
(@rank := @rank + 1) rankNo from (SELECT @rank := 0) t,(select bv.useOrgName, (@rank := @rank + 1) rankNo from (SELECT @rank := 0) t,(select distinct bv.vinNo,
bvoa.orgName deptName, bv.useOrgName,
bvoa.staffName, bvoa.orgName deptName,
bvoa.customerName, bvoa.staffName,
bvoa.contractNo, bvoa.customerName,
bv.modelName, bvoa.contractNo,
bv.vinNo, bv.modelName,
bvoa.saleTypeValue saleType,
bvoa.saleDate, bvoa.saleTypeValue saleType,
if(length(bh.closingDate) > 0, '已交付', '未交付') as handoverState, bvoa.saleDate,
DATE_FORMAT(bh.closingDate, '%Y-%m-%d') as handoverDate if(length(bh.closingDate) > 0, '已交付', '未交付') as handoverState,
DATE_FORMAT(bh.closingDate, '%Y-%m-%d') as handoverDate
from anrui_base.base_vehicle_out bvo from anrui_base.base_vehicle_out bvo
left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
left join anrui_base.base_vehicle bv on bvo.vinSid = bv.sid left join anrui_base.base_vehicle bv on bvo.vinSid = bv.sid

Loading…
Cancel
Save