From add5ae97ab9d07b50afa927ffca437c65c77c5be Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Mon, 9 Oct 2023 16:34:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/bussalesordervehicle/BusSalesOrderVehicleFeign.java   | 4 ++--
 .../biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java  | 4 ++--
 .../biz/bussalesordervehicle/BusSalesOrderVehicleRest.java    | 4 ++--
 .../biz/bussalesordervehicle/BusSalesOrderVehicleService.java | 4 ++--
 .../fin/api/finbillapplication/PcSelBillVinNoPageVo.java      | 4 ++++
 .../fin/biz/finbillapplication/FinBillApplicationMapper.xml   | 4 ++++
 .../fin/biz/finbillapplication/FinBillApplicationService.java | 2 +-
 .../biz/loanhomevisitprep/LoanHomevisitPrepService.java       | 4 ++--
 8 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java
index 3ae4e1b6f5..43a08586b7 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java
@@ -121,10 +121,10 @@ public interface BusSalesOrderVehicleFeign {
     @ResponseBody
     ResultBean<List<String>> selectListByvinNo(@RequestParam("vinNo") String vinNo);
 
-    @ApiOperation("更新订单车辆的贷款人sid和消贷合同sid")
+    @ApiOperation("更新订单车辆的消贷合同sid")
     @PostMapping("/updateXDCon")
     @ResponseBody
-    ResultBean updateXDCon(@RequestParam("sid") String sid, @RequestParam("borrowerSid") String borrowerSid, @RequestParam("loanContractSid") String loanContractSid);
+    ResultBean updateXDCon(@RequestParam("sid") String sid, @RequestParam("loanContractSid") String loanContractSid);
 
     @ApiOperation("根据销售订单sid和车辆sid查询销售订单车辆信息")
     @PostMapping("/selectByOrderSidAndVehSid")
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
index e0635c5177..4b8ab03b97 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
@@ -144,8 +144,8 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
 
     List<String> selectBySalesOrderSid(String saleOrderSid);
 
-    @Update("update bus_sales_order_vehicle set borrowerSid = #{borrowerSid},loanContractSid = #{loanContractSid} where sid = #{sid}")
-    void updateXDCon(@Param("sid") String sid, @Param("borrowerSid") String borrowerSid, @Param("loanContractSid") String loanContractSid);
+    @Update("update bus_sales_order_vehicle set loanContractSid = #{loanContractSid} where sid = #{sid}")
+    void updateXDCon(@Param("sid") String sid, @Param("loanContractSid") String loanContractSid);
 
     BusSalesOrderVehicleDetailsVo selectVinNoBySid(String sid);
 
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java
index 7135ad6d0a..c1ebefa03f 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java
@@ -129,8 +129,8 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
     }
 
     @Override
-    public ResultBean updateXDCon(String sid, String borrowerSid, String loanContractSid) {
-        return busSalesOrderVehicleService.updateXDCon(sid, borrowerSid, loanContractSid);
+    public ResultBean updateXDCon(String sid, String loanContractSid) {
+        return busSalesOrderVehicleService.updateXDCon(sid, loanContractSid);
     }
 
     @Override
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
index 55e88d4725..d41b501aa3 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
@@ -568,9 +568,9 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return baseMapper.selectOneByVehSidAndOrderSid(vehSid, orderSid);
     }
 
-    public ResultBean updateXDCon(String sid, String borrowerSid, String loanContractSid) {
+    public ResultBean updateXDCon(String sid, String loanContractSid) {
         ResultBean rb = ResultBean.fireFail();
-        baseMapper.updateXDCon(sid, borrowerSid, loanContractSid);
+        baseMapper.updateXDCon(sid, loanContractSid);
         return rb.success();
     }
 
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java
index dc5a318ef6..dc5de475f7 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java
@@ -9,6 +9,10 @@ import java.util.List;
 @Data
 public class PcSelBillVinNoPageVo implements Vo {
 
+    @ApiModelProperty("车型名称")
+    private String modelName;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
     @ApiModelProperty("发起人sid")
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml
index c6a40e22a3..61eb9fdf2d 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml
@@ -111,6 +111,8 @@
         bc.`certificateState` AS certificateStateKey,
         bc.`certificateStateValue` AS certificateState,
         bo.`purchaseSystemSid`,
+        bm.`modelName`,
+        bm.`modelSid`,
         bo.`oneBillMoney` AS kpMoney
         FROM
         anrui_buscenter.`bus_sales_order_vehicle` bv
@@ -120,6 +122,8 @@
         ON bv.`sid` = bs.`busSid`
         JOIN anrui_base.`base_vehicle_certificate` bc
         ON bv.`linkSid` = bc.`vehicleSid`
+        JOIN anrui_buscenter.`bus_sales_order_model` bm
+        ON bv.`salesOrderSid` = bm.`salesOrderSid`
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
index 5fa31ecc42..834c003649 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
@@ -408,7 +408,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             qw.eq("bv.linkNo", query.getVinNo());
         }
         if (query.getVins() != null && query.getVins().size() > 0) {
-            qw.notIn("bv.linkNo", query.getVins());
+            qw.notIn("bv.linkSid", query.getVins());
         }
         //移动端条件
         if (StringUtils.isNotBlank(query.getName())) {
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
index 65df92309a..fe58d2bc25 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
@@ -250,7 +250,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 busSalesOrderLoancontractDto.setBusNo("304");
                 busSalesOrderLoancontractDto.setBusName("资方终审确认");
                 String loanContractSid = busSalesOrderLoancontractFeign.save(busSalesOrderLoancontractDto).getData();
-                busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanHomevisitPrepVo.getBorrowerSid(), loanContractSid);
+                busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanContractSid);
             }
         } else if (conSetUpKey.equals("002")) {//一人一合同
             BusSalesOrderLoancontractDto busSalesOrderLoancontractDto = new BusSalesOrderLoancontractDto();
@@ -266,7 +266,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             busSalesOrderLoancontractDto.setBusName("资方终审确认");
             String loanContractSid = busSalesOrderLoancontractFeign.save(busSalesOrderLoancontractDto).getData();
             for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
-                busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanHomevisitPrepVo.getSid(), loanContractSid);
+                busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanContractSid);
             }
         }
         return rb.success();