销售订单确定贷款人

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -3493,7 +3493,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             //非删除
             qw.eq("bv.isDelete", 0);
             //库存状态为库存
-            qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
+            qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()));
             //锁定状态为未锁定
             qw.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode());
             List<String> list = params.getList();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -252,7 +252,10 @@
 
     <select id="selectListByOrdersSid"
             resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusBorrowVehicleVo">
-        select sid,ifnull(borrowerSid,'') as borrowerSid,borrowName,linkNo,linkSid from bus_sales_order_vehicle where salesOrderSid = #{saleOrderSid} group by borrowerSid
+        select sid,ifnull(borrowerSid,'') as borrowerSid,borrowName,linkNo,linkSid,if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)) as temporaryNo
+        from bus_sales_order_vehicle bv
+        left join bus_sales_order bso on bso.sid = bv.salesOrderSid
+        where bv.salesOrderSid = #{saleOrderSid} group by borrowerSid
     </select>
 
     <select id="selectByBorrowSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">