From 7838f7a1c9db53c927a9ec19dbee2948ee375d25 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 17 Apr 2024 14:20:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=B6=E8=AE=BF=E8=80=83?=
 =?UTF-8?q?=E5=AF=9F=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E6=97=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95sid=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/basevehicleout/BaseVehicleOutService.java    |  2 +-
 .../LoanHomevisitInvestigateCustomerFeign.java       |  4 ++--
 ...oanHomevisitInvestigateCustomerFeignFallback.java |  3 ++-
 .../LoanBeCollectionRecordService.java               |  2 +-
 .../LoanHomevisitInvestigateCustomerMapper.java      |  3 +--
 .../LoanHomevisitInvestigateCustomerMapper.xml       | 12 ++++++++++++
 .../LoanHomevisitInvestigateCustomerRest.java        |  4 ++--
 .../LoanHomevisitInvestigateCustomerService.java     |  4 ++--
 .../loanhomevisitprep/LoanHomevisitPrepService.java  |  2 +-
 9 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
index 674a58d033..3908caa5d6 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
@@ -2443,7 +2443,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             //电话
             baseQuotationVo.setMobile(busSalesOrderBorrowerDetailsVo.getMobile());
             //查询贷款人信息
-            LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerFeign.selectByBorrSid(busSalesOrderLoancontractDetailsVo.getBorrowerSid()).getData();
+            LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerFeign.selectByBorrSid(busSalesOrderLoancontractDetailsVo.getBorrowerSid(),busSalesOrder.getSid()).getData();
             //地址
             baseQuotationVo.setAddress(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerDomAddress());
             //挂靠公司名称
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerFeign.java
index 650cf2a66d..2edfd064fb 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerFeign.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerFeign.java
@@ -81,8 +81,8 @@ public interface LoanHomevisitInvestigateCustomerFeign {
     @ResponseBody
     ResultBean<LoanHomevisitInvestigateCustomerDetailsVo> selectByMainSid(@RequestParam("mainSid") String mainSid);
 
-    @ApiOperation("根据贷款人sid查询")
+    @ApiOperation("根据贷款人sid和销售订单sid查询")
     @GetMapping("/selectByBorrSid")
     @ResponseBody
-    ResultBean<LoanHomevisitInvestigateCustomerDetailsVo> selectByBorrSid(@RequestParam("borrowerSid") String borrowerSid);
+    ResultBean<LoanHomevisitInvestigateCustomerDetailsVo> selectByBorrSid(@RequestParam("borrowerSid") String borrowerSid,@RequestParam("orderSid") String orderSid);
 }
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerFeignFallback.java
index 6293481a4a..a79f600e1f 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerFeignFallback.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerFeignFallback.java
@@ -76,7 +76,8 @@ public class LoanHomevisitInvestigateCustomerFeignFallback implements LoanHomevi
 	}
 
 	@Override
-	public ResultBean<LoanHomevisitInvestigateCustomerDetailsVo> selectByBorrSid(String borrowerSid) {
+	public ResultBean<LoanHomevisitInvestigateCustomerDetailsVo> selectByBorrSid(String borrowerSid, String orderSid) {
 		return null;
 	}
+
 }
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java
index 60f05d6456..92e61dbd72 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java
@@ -192,7 +192,7 @@ public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeColl
 	public LoanBeCollectionRecordInit init(String saleVehSid) {
 		LoanBeCollectionRecordInit loanBeCollectionRecordInit = new LoanBeCollectionRecordInit();
 		BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(saleVehSid).getData();
-		LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(busSalesOrderVehicle.getBorrowerSid());
+		LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(busSalesOrderVehicle.getBorrowerSid(),busSalesOrderVehicle.getSalesOrderSid());
 		loanBeCollectionRecordInit.setBorrowerName(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName());
 		loanBeCollectionRecordInit.setBorrowerMobile(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerMobile());
 		loanBeCollectionRecordInit.setSpouseName(loanHomevisitInvestigateCustomerDetailsVo.getSpouseName());
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerMapper.java
index 3657ee0eb4..6094a9fc5b 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerMapper.java
@@ -68,8 +68,7 @@ public interface LoanHomevisitInvestigateCustomerMapper extends BaseMapper<LoanH
 	@Select("select * from loan_homevisit_investigate_customer where mainSid = #{sid}")
     LoanHomevisitInvestigateCustomerDetailsVo selByMainSid(String sid);
 
-	@Select("select * from loan_homevisit_investigate_customer where borrowerSid = #{saleOrderBorrowerSid}")
-    LoanHomevisitInvestigateCustomerDetailsVo fetchByBorrowerSid(String saleOrderBorrowerSid);
+    LoanHomevisitInvestigateCustomerDetailsVo fetchByBorrowerSid(@Param("saleOrderBorrowerSid") String saleOrderBorrowerSid,@Param("orderSid") String orderSid);
 
 	@Update("update loan_homevisit_investigate_customer set mainSid = #{mainSid} where sid = #{sid}")
 	void updateMainSid(@Param("sid") String sid,@Param("mainSid") String mainSid);
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerMapper.xml
index 4c7748bf4c..cce096b68e 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerMapper.xml
@@ -10,4 +10,16 @@
 	<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerVo">
 		SELECT * FROM loan_homevisit_investigate_customer <where> ${ew.sqlSegment} </where>
 	</select>
+
+	<select id="fetchByBorrowerSid"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDetailsVo">
+		SELECT
+				lc.*
+		FROM
+				loan_homevisit_investigate_customer lc
+						LEFT JOIN loan_homevisit_investigate li
+						ON lc.`mainSid` = li.`sid`
+		WHERE lc.borrowerSid = #{saleOrderBorrowerSid}
+		  AND li.`saleOrderSid` = #{orderSid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerRest.java
index 4db5927c04..df7e21ff1c 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerRest.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerRest.java
@@ -106,9 +106,9 @@ public class LoanHomevisitInvestigateCustomerRest implements LoanHomevisitInvest
 	}
 
 	@Override
-	public ResultBean<LoanHomevisitInvestigateCustomerDetailsVo> selectByBorrSid(String borrowerSid) {
+	public ResultBean<LoanHomevisitInvestigateCustomerDetailsVo> selectByBorrSid(String borrowerSid,String orderSid) {
 		ResultBean rb = ResultBean.fireFail();
-		LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(borrowerSid);
+		LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(borrowerSid,orderSid);
 		return rb.success().setData(loanHomevisitInvestigateCustomerDetailsVo);
 	}
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerService.java
index 5171cbb988..613525bdf8 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerService.java
@@ -112,8 +112,8 @@ public class LoanHomevisitInvestigateCustomerService extends MybatisBaseService<
 		return baseMapper.selByMainSid(sid);
 	}
 
-	public LoanHomevisitInvestigateCustomerDetailsVo fetchByBorrowerSid(String saleOrderBorrowerSid) {
-		return baseMapper.fetchByBorrowerSid(saleOrderBorrowerSid);
+	public LoanHomevisitInvestigateCustomerDetailsVo fetchByBorrowerSid(String saleOrderBorrowerSid,String orderSid) {
+		return baseMapper.fetchByBorrowerSid(saleOrderBorrowerSid,orderSid);
 	}
 
 	public void updateMainSid(String sid, String mainSid) {
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 7cfd380545..d64c838a67 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
@@ -307,7 +307,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         loanHomevisitInvestigate.setPrepSid(sid);
         loanHomevisitInvestigateService.save(loanHomevisitInvestigate);
         //查询是否已存在客户信息并关联
-        LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(loanHomevisitPrep.getSaleOrderBorrowerSid());
+        LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(loanHomevisitPrep.getSaleOrderBorrowerSid(),loanHomevisitPrep.getSaleOrderSid());
         if (loanHomevisitInvestigateCustomerDetailsVo != null) {
             List<LoanHomeVisitInvestigateInitOtherPeoVo> loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(loanHomevisitInvestigateCustomerDetailsVo.getMainSid());
             if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0) {