优化

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/LenderVo.java

@@ -23,4 +23,6 @@ public class LenderVo implements Vo {
     private boolean showDelete;
     @ApiModelProperty("是否显示确认，没确认可以确认")
     private boolean showConfirm;
+
+    private String vins;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -7550,6 +7550,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 } else {
                     confirmNum = confirmNum;
                 }
+                //查询车架号后8位
+                List<String> vinsList = busSalesOrderVehicleService.selectVinNos(sid,saleOrderSid);
+                if(!vinsList.isEmpty()){
+                    String vin = String.join(",",vinsList);
+                    lenderVo.setVins(vin);
+                }
             }
         }
         BusSalesOrderBorrower busSalesOrderBorrower1 = busSalesOrderBorrowerService.selectOrderSid(saleOrderSid);

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

@@ -162,4 +162,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     BusSalesOrderVehicle selectBySidAndOrderBo(@Param("saleOrderSid") String saleOrderSid, @Param("pos") String pos);
 
     List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid,@Param("borrowerSid") String borrowerSid);
+
+    List<String> selectVinNos(@Param("borrowSid") String sid, @Param("saleOrderSid") String saleOrderSid);
 }

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

@@ -297,4 +297,13 @@
         WHERE salesOrderSid = #{saleOrderSid}
           AND borrowerSid = #{borrowerSid}
     </select>
+
+    <select id="selectVinNos" resultType="java.lang.String">
+        select
+        if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) &lt; 1,
+              if(bso.payTypeKey = 2, RIGHT(bv.temporaryNo, 2), bv.temporaryNo),
+              RIGHT(bv.linkNo, 8)) as linkNo from bus_sales_order_vehicle bv
+        left join bus_sales_order bso on bso.sid = bv.salesOrderSid
+        where bv.salesOrderSid = #{saleOrderSid} and bv.borrowerSid = #{borrowSid}
+    </select>
 </mapper>

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

@@ -619,4 +619,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     public List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
         return baseMapper.selectListByOrderSidAndDkrSid(saleOrderSid, borrowerSid);
     }
+
+    public List<String> selectVinNos(String sid, String saleOrderSid) {
+        return baseMapper.selectVinNos(sid,saleOrderSid);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LenderListVo.java

@@ -22,4 +22,7 @@ public class LenderListVo implements Vo {
     private boolean showDelete;
     @ApiModelProperty("是否显示确认，没确认可以确认")
     private boolean showConfirm;
+
+    @ApiModelProperty("车架号")
+    private String vins;
 }