From f4138ea01cf6cce4c8c274ab72b314d93cc94c87 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 3 Jan 2024 15:15:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=82=AC=E6=94=B6?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5=E6=8C=89=E7=85=A7=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanBeCollectionRecordVehInit.java           |  6 ++++++
 .../LoanBeCollectionRecordService.java           |  2 ++
 .../loanbeoverdueveh/LoanBeOverdueVehMapper.xml  |  2 ++
 .../AppBeCollectionRecordVehInit.java            | 16 ++++++++++------
 .../risk/becollection/BeCollectionService.java   |  8 +++++---
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java
index bda8056d8b..a6b3d234cf 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java
@@ -21,8 +21,14 @@ public class LoanBeCollectionRecordVehInit {
     private String custPhone;
     @ApiModelProperty("客户及电话")
     private String custNameAndPhone;
+    @ApiModelProperty("实际还款人")
+    private String reaRepaymentName;
+    @ApiModelProperty("实际还款人电话")
+    private String reaRepaymentPhone;
     @ApiModelProperty("实际还款人及电话")
     private String reaRepaymentNameAndPhone;
+    @ApiModelProperty("贷款人")
+    private String loanName;
     @ApiModelProperty("贷款合同编号")
     private String loanContractNo;
     @ApiModelProperty("资方")
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 a3b1336111..c3853d7e97 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
@@ -204,6 +204,8 @@ public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeColl
 			BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanBeCollectionRecordVehInit.getSalesOrderSid()).getData();
 			BusSalesOrderVehicle busSalesOrderVehicle1 = busSalesOrderVehicleFeign.details(loanBeCollectionRecordVehInit.getSaleVehSid()).getData();
 			loanBeCollectionRecordVehInit.setReaRepaymentNameAndPhone(busSalesOrderVehicle1.getReaRepaymentName() + busSalesOrderVehicle1.getReaRepaymentPhone());
+			loanBeCollectionRecordVehInit.setReaRepaymentName(busSalesOrderVehicle1.getReaRepaymentName());
+			loanBeCollectionRecordVehInit.setReaRepaymentPhone(busSalesOrderVehicle1.getReaRepaymentPhone());
 			//催收记录sid
 			LoanBeCollectionVehFile loanBeCollectionVehFile1 = new LoanBeCollectionVehFile();
 			loanBeCollectionVehFile1.setName("催收记录");
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
index 408127cd47..a407d7f0c0 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
@@ -85,6 +85,7 @@
                 a1.mobile AS custPhone,
                 a1.`loanContractNo`,
                 a1.`bankName`,
+                a1.borrowerName AS loanName,
                 a1.vehMark AS carNum,
                 a1.dueDate AS firstBeDate,
                 COUNT(a1.sid) AS beOverduePeriod,
@@ -99,6 +100,7 @@
                 lrpd.`loanContractNo`,
                 lrpd.`vinNo`,
                 lrpd.`bankName`,
+                lrpd.borrowerName,
                 lrpd.dueDate,
                 lrpd.vehMark,
                 (
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionRecordVehInit.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionRecordVehInit.java
index 6aeb86686e..758b6849f0 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionRecordVehInit.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionRecordVehInit.java
@@ -13,14 +13,18 @@ public class AppBeCollectionRecordVehInit {
     private String vinNo;
     @ApiModelProperty("车牌号")
     private String carNum;
-    @ApiModelProperty("客户及电话")
-    private String custNameAndPhone;
-    @ApiModelProperty("实际还款人及电话")
-    private String reaRepaymentNameAndPhone;
-    @ApiModelProperty("贷款合同编号")
-    private String loanContractNo;
     @ApiModelProperty("资方")
     private String bankName;
+    @ApiModelProperty("客户名称")
+    private String cusName;
+    @ApiModelProperty("联系电话")
+    private String cusPhone;
+    @ApiModelProperty("实际还款人")
+    private String reaRepaymentName;
+    @ApiModelProperty("实际还款人电话")
+    private String reaRepaymentPhone;
+    @ApiModelProperty("贷款人")
+    private String loanName;
     @ApiModelProperty("首次逾期日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date firstBeDate;
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java
index f0319bc0bf..e5d3b819ea 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java
@@ -468,10 +468,12 @@ public class BeCollectionService {
             AppBeCollectionRecordVehInit appBeCollectionRecordVehInit = new AppBeCollectionRecordVehInit();
             appBeCollectionRecordVehInit.setVinNo(loanBeCollectionRecordVehInit.getVinNo());
             appBeCollectionRecordVehInit.setCarNum(loanBeCollectionRecordVehInit.getCarNum());
-            appBeCollectionRecordVehInit.setCustNameAndPhone(loanBeCollectionRecordVehInit.getCustNameAndPhone());
-            appBeCollectionRecordVehInit.setReaRepaymentNameAndPhone(loanBeCollectionRecordVehInit.getReaRepaymentNameAndPhone());
-            appBeCollectionRecordVehInit.setLoanContractNo(loanBeCollectionRecordVehInit.getLoanContractNo());
+            appBeCollectionRecordVehInit.setCusName(loanBeCollectionRecordVehInit.getCustName());
+            appBeCollectionRecordVehInit.setCusPhone(loanBeCollectionRecordVehInit.getCustPhone());
+            appBeCollectionRecordVehInit.setReaRepaymentName(loanBeCollectionRecordVehInit.getReaRepaymentName());
+            appBeCollectionRecordVehInit.setReaRepaymentPhone(loanBeCollectionRecordVehInit.getReaRepaymentPhone());
             appBeCollectionRecordVehInit.setBankName(loanBeCollectionRecordVehInit.getBankName());
+            appBeCollectionRecordVehInit.setLoanName(loanBeCollectionRecordVehInit.getLoanName());
             appBeCollectionRecordVehInit.setFirstBeDate(loanBeCollectionRecordVehInit.getFirstBeDate());
             appBeCollectionRecordVehInit.setBeOverduePeriod(loanBeCollectionRecordVehInit.getBeOverduePeriod());
             appBeCollectionRecordVehInit.setBeOverdueMoney(loanBeCollectionRecordVehInit.getBeOverdueMoney());