修改

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

@@ -46,12 +46,14 @@ import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomer;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.anrui.riskcenter.biz.loanbeoverdueveh.LoanBeOverdueVehService;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerService;
+import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
 import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import org.apache.commons.lang3.StringUtils;
@@ -92,6 +94,8 @@ public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeColl
     private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
     @Autowired
     private LoanHomevisitInvestigateService loanHomevisitInvestigateService;
+    @Autowired
+    private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
 
     private QueryWrapper<LoanBeCollectionRecord> createQueryWrapper(LoanBeCollectionRecordQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -109,7 +113,7 @@ public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeColl
         return p;
     }
 
-	public void saveOrUpdateDto(LoanBeCollectionRecordDto dto){
+    public void saveOrUpdateDto(LoanBeCollectionRecordDto dto) {
         String dtoSid = dto.getSid();
         List<LoanBeCollectionRecordFile> loanBeCollectionRecordFileList = dto.getLoanBeCollectionRecordFileList();
         List<LoanBeCollectionRecordVehInit> loanBeCollectionRecordVehInitList = dto.getLoanBeCollectionRecordVehInitList();
@@ -122,7 +126,7 @@ public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeColl
                 dto.setUseOrgSid(useOrgSid);
                 dto.setSaleVehSid(loanBeCollectionRecordVehInit.getSaleVehSid());
                 String sid = this.insertByDto(dto);
-				if (loanBeCollectionRecordFileList.size() > 0){
+                if (loanBeCollectionRecordFileList.size() > 0) {
                     for (LoanBeCollectionRecordFile loanBeCollectionRecordFile : loanBeCollectionRecordFileList) {
                         LoanFile loanFile = new LoanFile();
                         loanFile.setLinkSid(sid);
@@ -141,14 +145,14 @@ public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeColl
         this.updateByDto(dto);
     }
 
-	public String insertByDto(LoanBeCollectionRecordDto dto){
+    public String insertByDto(LoanBeCollectionRecordDto dto) {
         LoanBeCollectionRecord entity = new LoanBeCollectionRecord();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         baseMapper.insert(entity);
         return entity.getSid();
     }
 
-	public void updateByDto(LoanBeCollectionRecordDto dto){
+    public void updateByDto(LoanBeCollectionRecordDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
@@ -158,13 +162,13 @@ public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeColl
         baseMapper.updateById(entity);
     }
 
-	public LoanBeCollectionRecordDetailsVo fetchDetailsVoBySid(String sid){
+    public LoanBeCollectionRecordDetailsVo fetchDetailsVoBySid(String sid) {
         LoanBeCollectionRecord entity = fetchBySid(sid);
         LoanBeCollectionRecordDetailsVo vo = new LoanBeCollectionRecordDetailsVo();
         BeanUtil.copyProperties(entity, vo);
         List<LoanFile> loanFiles = loanFileService.selectByLinkSid(sid, LoanFileEnum.BECOLLECTIONRECORD.getAttachType());
         List<LoanBeCollectionRecordFile> loanBeCollectionRecordFiles = new ArrayList<>();
-		if (loanFiles != null && loanFiles.size() > 0){
+        if (loanFiles != null && loanFiles.size() > 0) {
             for (LoanFile loanFile : loanFiles) {
                 LoanBeCollectionRecordFile loanBeCollectionRecordFile = new LoanBeCollectionRecordFile();
                 String filePath = loanFile.getFilePath();
@@ -180,23 +184,21 @@ public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeColl
 
     public LoanBeCollectionRecordInit init(String saleVehSid) {
         LoanBeCollectionRecordInit loanBeCollectionRecordInit = new LoanBeCollectionRecordInit();
-		BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(saleVehSid).getData();
+        LoanRepaymentPlanDetails loanRepaymentPlanDetails = loanRepaymentPlanDetailsService.fetchMainBankByBusVinSid(saleVehSid);
-		BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerFeign.fetchEntityBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
+        //贷款人名称
-		LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(busSalesOrderVehicle.getBorrowerSid());
+        loanBeCollectionRecordInit.setBorrowerName(loanRepaymentPlanDetails.getBorrowerName());
-		if (loanHomevisitInvestigateCustomerDetailsVo == null){
+        BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerFeign.fetchEntityBySid(loanRepaymentPlanDetails.getBorrowerSid()).getData();
-			if (busSalesOrderBorrower == null){
+        LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(loanRepaymentPlanDetails.getBorrowerSid());
-				loanBeCollectionRecordInit.setBorrowerName(busSalesOrderVehicle.getBorrowName());
+        if (loanHomevisitInvestigateCustomerDetailsVo == null) {
-			}else {
+            if (busSalesOrderBorrower != null) {
-				loanBeCollectionRecordInit.setBorrowerName(busSalesOrderBorrower.getBorrowerName());
                 loanBeCollectionRecordInit.setBorrowerMobile(busSalesOrderBorrower.getMobile());
             }
-		}else {
+        } else {
-			loanBeCollectionRecordInit.setBorrowerName(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName());
             loanBeCollectionRecordInit.setBorrowerMobile(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerMobile());
             loanBeCollectionRecordInit.setSpouseName(loanHomevisitInvestigateCustomerDetailsVo.getSpouseName());
             loanBeCollectionRecordInit.setSpouseMobile(loanHomevisitInvestigateCustomerDetailsVo.getSpouseMobile());
         }
-		List<LoanBeCollectionRecordVehInit> loanBeCollectionRecordVehInits = loanBeOverdueVehService.initVehListByBorrSid(busSalesOrderVehicle.getBorrowerSid());
+        List<LoanBeCollectionRecordVehInit> loanBeCollectionRecordVehInits = loanBeOverdueVehService.initVehListByBorrSid(loanRepaymentPlanDetails.getBorrowerSid());
         for (LoanBeCollectionRecordVehInit loanBeCollectionRecordVehInit : loanBeCollectionRecordVehInits) {
             List<LoanBeCollectionVehFile> loanBeCollectionVehFiles = new ArrayList<>();
             loanBeCollectionRecordVehInit.setCustNameAndPhone(loanBeCollectionRecordVehInit.getCustName() + loanBeCollectionRecordVehInit.getCustPhone());
@@ -227,7 +229,7 @@ public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeColl
             loanBeCollectionVehFile4.setSid(loanBeCollectionRecordVehInit.getSalesOrderSid());
             loanBeCollectionVehFiles.add(loanBeCollectionVehFile4);
             //家访考察报告sid
-			String sid = loanHomevisitInvestigateService.selectByBorrSid(busSalesOrderVehicle.getBorrowerSid());
+            String sid = loanHomevisitInvestigateService.selectByBorrSid(loanRepaymentPlanDetails.getBorrowerSid());
             LoanBeCollectionVehFile loanBeCollectionVehFile5 = new LoanBeCollectionVehFile();
             loanBeCollectionVehFile5.setName("家访考察报告");
             loanBeCollectionVehFile5.setSid(sid);