Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java

@@ -114,4 +114,9 @@ public interface BusSalesOrderLoancontractFeign {
     @PostMapping("/checkContractNo")
     @ResponseBody
     ResultBean<String> checkContractNo(@RequestParam("contractNo") String contractNo);
+
+    @ApiOperation("根据贷款人sid查询")
+    @PostMapping("/fetchAllByBorrowerSid")
+    @ResponseBody
+    ResultBean<List<BusSalesOrderLoancontract>> fetchAllByBorrowerSid(@RequestParam("saleOrderBorrowerSid") String saleOrderBorrowerSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java

@@ -109,4 +109,9 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan
 	public ResultBean<String> checkContractNo(String contractNo) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<BusSalesOrderLoancontract>> fetchAllByBorrowerSid(String saleOrderBorrowerSid) {
+		return null;
+	}
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java

@@ -82,4 +82,7 @@ public interface BusSalesOrderLoancontractMapper extends BaseMapper<BusSalesOrde
     List<BusSalesOrderLoancontract> fetchAllByOrderSid(String sid);
 
     String checkContractNo(String contractNo);
+
+    @Select("select * from bus_sales_order_loancontract where borrowerSid = #{saleOrderBorrowerSid}")
+    List<BusSalesOrderLoancontract> fetchAllByBorrowerSid(String saleOrderBorrowerSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java

@@ -138,4 +138,9 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF
 	public ResultBean<String> checkContractNo(String contractNo) {
 		return busSalesOrderLoancontractService.checkContractNo(contractNo);
 	}
+
+	@Override
+	public ResultBean<List<BusSalesOrderLoancontract>> fetchAllByBorrowerSid(String saleOrderBorrowerSid) {
+		return busSalesOrderLoancontractService.fetchAllByBorrowerSid(saleOrderBorrowerSid);
+	}
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@@ -491,4 +491,10 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
         String num = baseMapper.checkContractNo(contractNo);
         return rb.success().setData(num);
     }
+
+    public ResultBean<List<BusSalesOrderLoancontract>> fetchAllByBorrowerSid(String saleOrderBorrowerSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BusSalesOrderLoancontract> busSalesOrderLoancontracts = baseMapper.fetchAllByBorrowerSid(saleOrderBorrowerSid);
+        return rb.success().setData(busSalesOrderLoancontracts);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java

@@ -413,7 +413,8 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         this.updateByDto(dto);
         if (!"1".equals(dto.getIsSave())){
-            List<BusSalesOrderLoancontract> busSalesOrderLoancontracts = busSalesOrderLoancontractFeign.fetchAllByOrderSid(dto.getSaleOrderSid()).getData();
+            LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(dto.getHomeVisitSid());
+            List<BusSalesOrderLoancontract> busSalesOrderLoancontracts = busSalesOrderLoancontractFeign.fetchAllByBorrowerSid(loanHomevisitInvestigate.getSaleOrderBorrowerSid()).getData();
             if (busSalesOrderLoancontracts != null){
                 for (BusSalesOrderLoancontract busSalesOrderLoancontract : busSalesOrderLoancontracts) {
                     LoanCapitalCreditResultDto loanCapitalCreditResultDto = new LoanCapitalCreditResultDto();