修改

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrower.java

@@ -31,19 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: anrui-buscenter(销售订单) <br/>
- * File: BusSalesOrderBorrower.java <br/>
- * Class: com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower <br/>
- * Description: 销售订单-贷款人. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-08-10 13:46:47 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "销售订单-贷款人", description = "销售订单-贷款人")
 @TableName("bus_sales_order_borrower")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerDetailsVo.java

@@ -25,26 +25,12 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer;
 
-
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: anrui-riskcenter(家访考察) <br/>
- * File: LoanHomevisitInvestigateCustomerVo.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerVo <br/>
- * Description: 家访考察-客户信息 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-08-10 15:13:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "家访考察-客户信息 视图数据详情", description = "家访考察-客户信息 视图数据详情")
 public class LoanHomevisitInvestigateCustomerDetailsVo implements Vo {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java

@@ -30,6 +30,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
+import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
@@ -65,19 +67,6 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(逾期催收记录) <br/>
- * File: LoanBeCollectionRecordService.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanbecollectionrecord.LoanBeCollectionRecordService <br/>
- * Description: 逾期催收记录 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-11 13:45:40 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeCollectionRecordMapper, LoanBeCollectionRecord> {
 
@@ -98,7 +87,7 @@ public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeColl
 	@Autowired
 	private BusSalesOrderFeign busSalesOrderFeign;
 	@Autowired
-	private LoanSolutionsService loanSolutionsService;
+	private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
 	@Autowired
 	private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
 	@Autowired
@@ -192,11 +181,17 @@ public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeColl
 	public LoanBeCollectionRecordInit init(String saleVehSid) {
 		LoanBeCollectionRecordInit loanBeCollectionRecordInit = new LoanBeCollectionRecordInit();
 		BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(saleVehSid).getData();
+		BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerFeign.fetchEntityBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
 		LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(busSalesOrderVehicle.getBorrowerSid());
+		if (loanHomevisitInvestigateCustomerDetailsVo == null){
+			loanBeCollectionRecordInit.setBorrowerName(busSalesOrderBorrower.getBorrowerName());
+			loanBeCollectionRecordInit.setBorrowerMobile(busSalesOrderBorrower.getMobile());
+		}else {
 			loanBeCollectionRecordInit.setBorrowerName(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName());
 			loanBeCollectionRecordInit.setBorrowerMobile(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerMobile());
 			loanBeCollectionRecordInit.setSpouseName(loanHomevisitInvestigateCustomerDetailsVo.getSpouseName());
 			loanBeCollectionRecordInit.setSpouseMobile(loanHomevisitInvestigateCustomerDetailsVo.getSpouseMobile());
+		}
 		List<LoanBeCollectionRecordVehInit> loanBeCollectionRecordVehInits = loanBeOverdueVehService.initVehListByBorrSid(busSalesOrderVehicle.getBorrowerSid());
 		for (LoanBeCollectionRecordVehInit loanBeCollectionRecordVehInit : loanBeCollectionRecordVehInits) {
 			List<LoanBeCollectionVehFile> loanBeCollectionVehFiles = new ArrayList<>();