优化

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

@@ -7490,7 +7490,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
         }
         VinVo2 vinVo = new VinVo2();
-        List<BusBorrowVehicleVo> busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrdersSid(saleOrderSid);
+        List<BusBorrowVehicleVo> busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrdersSid2(saleOrderSid);
         busSalesOrderVehicleList.removeAll(Collections.singleton(null));
         List<String> borrowSidList = busSalesOrderVehicleList.stream().map(v -> v.getBorrowerSid()).collect(Collectors.toList());
         List<VinListVo2> vinList = new ArrayList<>();
@@ -7511,6 +7511,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     String borrowName = busSalesOrderVehicle.getBorrowName();
                     if (StringUtils.isNotBlank(borrowSid)) {
                         BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.fetchBySid(borrowSid);
+                        if(busSalesOrderBorrower.getState() != 1){
+                            continue;
+                        }
                         borrowName = busSalesOrderBorrower.getBorrowerName();
                         vinListVo2.setGroupName("贷款人:" + borrowName);
                     } else {

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

@@ -151,6 +151,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     BusSalesOrderVehicleDetailsVo selectVinNoBySid(String sid);
 
     List<BusBorrowVehicleVo> selectListByOrdersSid(String saleOrderSid);
+    List<BusBorrowVehicleVo> selectListByOrdersSid2(String saleOrderSid);
 
     BusSalesOrderVehicle selectByBorrowSid(String sid);
 

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

@@ -272,6 +272,14 @@
         where bv.salesOrderSid = #{saleOrderSid} and bbb.state = 1 group by bv.borrowerSid
     </select>
 
+    <select id="selectListByOrdersSid2"
+            resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusBorrowVehicleVo">
+        select bv.sid,ifnull(bv.borrowerSid,'') as borrowerSid,bv.borrowName,bv.linkNo,bv.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 bv.borrowerSid
+    </select>
+
     <select id="selectByBorrowSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
         select * from bus_sales_order_vehicle where borrowerSid = #{sid}
     </select>

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

@@ -590,6 +590,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return baseMapper.selectListByOrdersSid(saleOrderSid);
     }
 
+    public List<BusBorrowVehicleVo> selectListByOrdersSid2(String saleOrderSid) {
+        return baseMapper.selectListByOrdersSid2(saleOrderSid);
+    }
+
     public BusSalesOrderVehicle selectByBorrowSid(String sid) {
         return baseMapper.selectByBorrowSid(sid);
     }