Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java

@@ -355,7 +355,7 @@ public class BaseDistributorRest implements BaseDistributorFeign {
 
     @Override
     public ResultBean<List<AppDisAndCustm>> invoiceName2(String userSid, String orgPath, String search, String invoiceKey) {
-        return baseDistributorService.invoiceName2(userSid, orgPath, search,invoiceKey);
+        return baseDistributorService.invoiceName2(userSid, orgPath, search, invoiceKey);
     }
 
     @Override

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -109,13 +109,11 @@ public interface BusSalesOrderVehicleFeign {
     @ResponseBody
     ResultBean<BusSalesOrderVehicle> selectByNoAndVinSid(@RequestParam("contractNo") String contractNo, @RequestParam("vehSid") String vehSid);
 
-
     @ApiOperation("根据销售订单sid查车辆信息")
     @PostMapping("/selectListByOrderSid")
     @ResponseBody
     ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSid(@RequestParam("sid") String sid);
 
-
     @ApiOperation("根据车架号模糊查车辆信息")
     @PostMapping("/selectListByvinNo")
     @ResponseBody
@@ -140,4 +138,9 @@ public interface BusSalesOrderVehicleFeign {
     @GetMapping("/selectOneByBorrowerSid")
     @ResponseBody
     ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid(@RequestParam("borrowerSid") String borrowerSid);
+
+    @ApiOperation("根据销售订单sid和贷款人sid查车辆信息")
+    @PostMapping("/selectListByOrderSidAndDkrSid")
+    @ResponseBody
+    ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSid(@RequestParam("saleOrderSid") String saleOrderSid,@RequestParam("borrowerSid") String borrowerSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -133,4 +133,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
+    @Override
+    public ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
+        return null;
+    }
+
 }

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

@@ -160,4 +160,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     List<BusVehicleBorrowVo> saleOrderInputLenderVins(String sale0rderSid);
 
     BusSalesOrderVehicle selectBySidAndOrderBo(@Param("saleOrderSid") String saleOrderSid, @Param("pos") String pos);
+
+    List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid,@Param("borrowerSid") String borrowerSid);
 }

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

@@ -289,4 +289,12 @@
         select bv.* from bus_sales_order_vehicle bv left join bus_sales_order bo on bo.sid = bv.salesOrderSid
         where if(bo.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)) = #{pos} and bv.salesOrderSid = #{saleOrderSid}
     </select>
+
+    <select id="selectListByOrderSidAndDkrSid"
+            resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        SELECT *
+        FROM bus_sales_order_vehicle
+        WHERE salesOrderSid = #{saleOrderSid}
+          AND borrowerSid = #{borrowerSid}
+    </select>
 </mapper>

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

@@ -148,5 +148,10 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
         return busSalesOrderVehicleService.selectOneByBorrowerSid(borrowerSid);
     }
 
-
+    @Override
+    public ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selectListByOrderSidAndDkrSid(saleOrderSid, borrowerSid);
+        return rb.success().setData(busSalesOrderVehicles);
+    }
 }

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

@@ -615,4 +615,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         BusSalesOrderVehicle busSalesOrderVehicle = selectByBorrowSid(borrowerSid);
         return rb.success().setData(busSalesOrderVehicle);
     }
+
+    public List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
+        return baseMapper.selectListByOrderSidAndDkrSid(saleOrderSid, borrowerSid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -232,7 +232,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
     public ResultBean saveLoanCon(String sid, String conSetUpKey) {
         ResultBean rb = ResultBean.fireFail();
         LoanHomevisitPrepVo loanHomevisitPrepVo = baseMapper.selectDetails(sid);
-        List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSid(loanHomevisitPrepVo.getSaleOrderSid()).getData();
+        List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(loanHomevisitPrepVo.getSaleOrderSid(),loanHomevisitPrepVo.getBorrowerSid()).getData();
         if (conSetUpKey.equals("001")) {//一车一合同
             int i = 1;
             for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {