From ced80f5f5771fb702df9a4e897d90556390def21 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Wed, 16 Jul 2025 17:02:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mappers/business/backstage/SupDispatchCarMapper.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml index 680311e..75326f6 100644 --- a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml +++ b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml @@ -321,11 +321,12 @@ select cpo.id,cpo.type,cpo.apply_id planId,cpa.code ,cpa.user_name userName , cpa.create_time applyTime ,cpa.remark,cpo.out_time outTime ,cpo.dispatch_num dispatchNum,cpo.status, IFNULL(file.num ,0) fileNum,pro.name proName, + cs.`name` as supName, CASE WHEN cpo.file_status IS NULL THEN '待上传' WHEN cpo.file_status = 0 THEN '待审核' - WHEN cpo.file_status = 1 THEN '审核通过' - WHEN cpo.file_status = 2 THEN '审核驳回' + WHEN cpo.file_status = 1 THEN '已通过' + WHEN cpo.file_status = 2 THEN '已驳回' ELSE '' END AS fileStatus FROM car_plan_out cpo @@ -336,6 +337,7 @@ where model_table='car_plan_out' AND type='到货确认单' GROUP BY own_id )file on file.id=concat(cpo.id,'-dh') + LEFT JOIN car_supplier cs ON cs.id = cpo.sup_id where 1=1 and cpo.status=2 and ( @@ -346,6 +348,9 @@ pro.name like concat('%',#{keyWord},'%') ) + + and cpo.sup_id=#{supId} + order by cpo.create_time desc select cdi.id, cdi.name, cdi.phone, cdi.sup_id supId,cs.name supName,cdi.is_white as isWhiteList from car_driver_info cdi - left join car_supplier cs on cs.id=cdi.id - where cdi.id=#{id} + left join car_supplier cs on cs.id=cdi.sup_id + where cdi.id=#{id}