diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java index 490b0836f8..48360030c7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java +++ b/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> invoiceName2(String userSid, String orgPath, String search, String invoiceKey) { - return baseDistributorService.invoiceName2(userSid, orgPath, search,invoiceKey); + return baseDistributorService.invoiceName2(userSid, orgPath, search, invoiceKey); } @Override 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 43a08586b7..c3b0dac0b2 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 @@ -109,13 +109,11 @@ public interface BusSalesOrderVehicleFeign { @ResponseBody ResultBean selectByNoAndVinSid(@RequestParam("contractNo") String contractNo, @RequestParam("vehSid") String vehSid); - @ApiOperation("根据销售订单sid查车辆信息") @PostMapping("/selectListByOrderSid") @ResponseBody ResultBean> selectListByOrderSid(@RequestParam("sid") String sid); - @ApiOperation("根据车架号模糊查车辆信息") @PostMapping("/selectListByvinNo") @ResponseBody @@ -140,4 +138,9 @@ public interface BusSalesOrderVehicleFeign { @GetMapping("/selectOneByBorrowerSid") @ResponseBody ResultBean selectOneByBorrowerSid(@RequestParam("borrowerSid") String borrowerSid); + + @ApiOperation("根据销售订单sid和贷款人sid查车辆信息") + @PostMapping("/selectListByOrderSidAndDkrSid") + @ResponseBody + ResultBean> selectListByOrderSidAndDkrSid(@RequestParam("saleOrderSid") String saleOrderSid,@RequestParam("borrowerSid") String borrowerSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java index e07d8ede16..98c0a881f2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java +++ b/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> selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) { + return null; + } + } \ No newline at end of file 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 7b48b9c840..7c5e8353f9 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 @@ -160,4 +160,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper saleOrderInputLenderVins(String sale0rderSid); BusSalesOrderVehicle selectBySidAndOrderBo(@Param("saleOrderSid") String saleOrderSid, @Param("pos") String pos); + + List selectListByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid,@Param("borrowerSid") String borrowerSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index 1bf152de0b..0076a9a114 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/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} + + \ No newline at end of file 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 c1ebefa03f..8372598039 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 @@ -148,5 +148,10 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign { return busSalesOrderVehicleService.selectOneByBorrowerSid(borrowerSid); } - + @Override + public ResultBean> selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) { + ResultBean rb = ResultBean.fireFail(); + List busSalesOrderVehicles = busSalesOrderVehicleService.selectListByOrderSidAndDkrSid(saleOrderSid, borrowerSid); + return rb.success().setData(busSalesOrderVehicles); + } } 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 5dfd143686..30e7be05b1 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 @@ -615,4 +615,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) { + return baseMapper.selectListByOrderSidAndDkrSid(saleOrderSid, borrowerSid); + } } \ No newline at end of file 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 fe58d2bc25..6ed8bac12f 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 @@ -232,7 +232,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSid(loanHomevisitPrepVo.getSaleOrderSid()).getData(); + List busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(loanHomevisitPrepVo.getSaleOrderSid(),loanHomevisitPrepVo.getBorrowerSid()).getData(); if (conSetUpKey.equals("001")) {//一车一合同 int i = 1; for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {