From a5286f0f454a923b63e2e39d2c70f96b11817dce Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 29 Aug 2023 10:59:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E8=AE=BF=E3=80=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinFundsCarriedForwardVeh.java                          | 3 ++-
 .../FinFundsCarriedForwardVehDetailsVo.java                 | 2 ++
 .../FinFundsCarriedForwardVehDto.java                       | 2 ++
 .../FinFundsCarriedForwardApplyService.java                 | 1 +
 .../LoanHomeVisitInvestigateReservationDto.java             | 2 +-
 .../LoanHomevisitInvestigateMapper.java                     | 4 ++--
 .../LoanHomevisitInvestigateService.java                    | 6 +++++-
 .../AppLoanHomeVisitInvestigateReservationDto.java          | 2 +-
 8 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVeh.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVeh.java
index 8330996e77..0313d40a6d 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVeh.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVeh.java
@@ -72,5 +72,6 @@ public class FinFundsCarriedForwardVeh extends BaseEntity {
     private BigDecimal balance; // 剩余金额
 	@ApiModelProperty("本次使用金额")
     private BigDecimal thisUseMoney; // 本次使用金额
-
+    @ApiModelProperty("应收项目名称")
+    private String receivablesName;
 }
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDetailsVo.java
index 1048c7b2f0..9060f05178 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDetailsVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDetailsVo.java
@@ -71,4 +71,6 @@ public class FinFundsCarriedForwardVehDetailsVo implements Vo {
     private String thisUseMoney; // 本次使用金额
     @ApiModelProperty("联系电话")
     private String draweeMobile;
+    @ApiModelProperty("应收项目名称")
+    private String receivablesName;
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java
index fc503ddb18..7ce296f0b3 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java
@@ -69,4 +69,6 @@ public class FinFundsCarriedForwardVehDto implements Dto {
     private String balance; // 剩余金额
 	@ApiModelProperty("本次使用金额")
     private String thisUseMoney; // 本次使用金额
+    @ApiModelProperty("应收项目名称")
+    private String receivablesName;
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
index 2fbc644140..67c0d901cc 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
@@ -401,6 +401,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             finFundsCarriedForwardVehDetailsVo.setCustomerName(finSelectedReceivablesDetailed.getCustomerName());
             finFundsCarriedForwardVehDetailsVo.setVinNo(finSelectedReceivablesDetailed.getVIN());
             finFundsCarriedForwardVehDetailsVo.setBalance(finSelectedReceivablesDetailed.getBalance());
+            finFundsCarriedForwardVehDetailsVo.setReceivablesName(finSelectedReceivablesDetailed.getReceivablesName());
             finFundsCarriedForwardVehDetailsVos.add(finFundsCarriedForwardVehDetailsVo);
             finFundsCarriedForwardApplyDetailsVo.setPurchaseSystemSid(finSelectedReceivablesDetailed.getPurchaseSystemSid());
             finFundsCarriedForwardApplyDetailsVo.setPurchaseSystem(finSelectedReceivablesDetailed.getPurchaseSystemName());
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateReservationDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateReservationDto.java
index 2d2675a6d2..b3cc19759a 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateReservationDto.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateReservationDto.java
@@ -12,5 +12,5 @@ public class LoanHomeVisitInvestigateReservationDto implements Dto {
     @ApiModelProperty("预约时间")
     private String times;
     @ApiModelProperty("预约地址")
-    private String adress;
+    private String address;
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java
index 429ac8073d..c820e06060 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java
@@ -68,8 +68,8 @@ public interface LoanHomevisitInvestigateMapper extends BaseMapper<LoanHomevisit
     @Update("update loan_homevisit_investigate set state = '2',investigateKey = #{investigateKey},investigateValue = #{investigateValue} where sid = #{sid}")
     void isPassThrough(@Param("sid") String sid, @Param("investigateKey") String investigateKey, @Param("investigateValue") String investigateValue);
 
-    @Update("update loan_homevisit_investigate set resHomeVisDate = #{times},homeVisAddress = #{adress} where sid = #{sid}")
-    void saveAppointmentInfo(@Param("sid") String sid, @Param("times") String times, @Param("adress") String adress);
+    @Update("update loan_homevisit_investigate set resHomeVisDate = #{times},homeVisAddress = #{address} where sid = #{sid}")
+    void saveAppointmentInfo(@Param("sid") String sid, @Param("times") String times, @Param("address") String address);
 
     LoanHomeVisitInvestigateInitCustomerVo getHomeVisitCustomerInfo(String sid);
 
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
index e7f3c4d808..6d7efad819 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
@@ -331,7 +331,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
 
     public ResultBean saveAppointmentInfo(LoanHomeVisitInvestigateReservationDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        baseMapper.saveAppointmentInfo(dto.getSid(), dto.getTimes(), dto.getAdress());
+        baseMapper.saveAppointmentInfo(dto.getSid(), dto.getTimes(), dto.getAddress());
         return rb.success();
     }
 
@@ -474,6 +474,8 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomeVisitInvestigateInitCustomerVo.setLenderNam(busSalesOrderBorrowerDetailsVo.getBorrowerName());
             loanHomeVisitInvestigateInitCustomerVo.setIdNumber(crmCustomerTempVo.getIDNumber());
             loanHomeVisitInvestigateInitCustomerVo.setMobile(busSalesOrderBorrowerDetailsVo.getMobile());
+            loanHomeVisitInvestigateInitCustomerVo.setMainSid(sid);
+            return rb.success().setData(loanHomeVisitInvestigateInitCustomerVo);
         }
         //银行卡附件
         List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
@@ -487,6 +489,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //其他人员
         List<LoanHomeVisitInvestigateInitOtherPeoVo> loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid);
         loanHomeVisitInvestigateInitCustomerVo.setOtherPersonnel(loanHomeVisitInvestigateInitOtherPeoVos);
+        loanHomeVisitInvestigateInitCustomerVo.setMainSid(sid);
         return rb.success().setData(loanHomeVisitInvestigateInitCustomerVo);
     }
 
@@ -529,6 +532,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         loanHomevisitInvestigateCustomerDto.setEmergencyMobile(dto.getEmergencyContactMobile());
         loanHomevisitInvestigateCustomerDto.setRelationshipKey(dto.getEmergencyContactTypeKey());
         loanHomevisitInvestigateCustomerDto.setRelationshipValue(dto.getEmergencyContactType());
+        loanHomevisitInvestigateCustomerDto.setMainSid(dto.getMainSid());
         loanHomevisitInvestigateCustomerService.saveOrUpdateDto(loanHomevisitInvestigateCustomerDto);
         loanHomevisitInvestigateOtherpeoService.delByMainSid(dto.getMainSid());
         for (LoanHomeVisitInvestigateSaveOtherPeoDto loanHomeVisitInvestigateSaveOtherPeoDto : otherPersonnel) {
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateReservationDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateReservationDto.java
index c4d983d482..f6ff0bbb76 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateReservationDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateReservationDto.java
@@ -12,5 +12,5 @@ public class AppLoanHomeVisitInvestigateReservationDto implements Dto {
     @ApiModelProperty("预约时间")
     private String times;
     @ApiModelProperty("预约地址")
-    private String adress;
+    private String address;
 }