交回报备优化

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDetailsVo.java

@@ -84,6 +84,7 @@ public class LoanRestoreReportApplyDetailsVo implements Vo {
     private String bankName; // 资方
 	@ApiModelProperty("资方合同编号")
     private String bankContractNo; // 资方合同编号
+
 	@ApiModelProperty("已还金额")
     private String alRepaidMoney; // 已还金额
 	@ApiModelProperty("当前逾期金额")
@@ -100,6 +101,7 @@ public class LoanRestoreReportApplyDetailsVo implements Vo {
     private String alRepaidMoneyConPeriod; // 已还金额换算期数
 	@ApiModelProperty("逾期金额换算期数")
     private String beOverdueMoneyAndPeriod; // 逾期金额换算期数
+    
 	@ApiModelProperty("交回方式key")
     private String restoreTypeKey; // 交回方式key
 	@ApiModelProperty("交回方式value")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java

@@ -351,8 +351,16 @@ public class LoanRestoreReportApplyService extends MybatisBaseService<LoanRestor
         LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(busSalesOrderVehicle.getSalesOrderSid());
         loanRestoreReportApplyDetailsVo.setJrfaSid(loanSolutions.getSid());
         loanRestoreReportApplyDetailsVo.setCurrentBeMoney(loanVehClearanceVehInit.getBeOverdueMoney());
-        loanRestoreReportApplyDetailsVo.setBeOverdueMoneyAndPeriod(loanVehClearanceVehInit.getBeOverdueMoneyAndPeriod());
         loanRestoreReportApplyDetailsVo.setSaleVehSid(saleVehSid);
+        AlrepaidAndArrVo alrepaidAndArr = getAlrepaidAndArr(saleVehSid);
+        loanRestoreReportApplyDetailsVo.setAlRepaidMoney(alrepaidAndArr.getAlRepaidMoney());
+        loanRestoreReportApplyDetailsVo.setCurrentBeMoney(alrepaidAndArr.getCurrentBeMoney());
+        loanRestoreReportApplyDetailsVo.setWheFundOccMoney(alrepaidAndArr.getWheFundOccMoney());
+        loanRestoreReportApplyDetailsVo.setUnexpiredMoney(alrepaidAndArr.getUnexpiredMoney());
+        loanRestoreReportApplyDetailsVo.setNper(alrepaidAndArr.getNper());
+        loanRestoreReportApplyDetailsVo.setCurrentPeriod(alrepaidAndArr.getCurrentPeriod());
+        loanRestoreReportApplyDetailsVo.setAlRepaidMoneyConPeriod(alrepaidAndArr.getAlRepaidMoneyConPeriod());
+        loanRestoreReportApplyDetailsVo.setBeOverdueMoneyAndPeriod(alrepaidAndArr.getBeOverdueMoneyAndPeriod());
         return loanRestoreReportApplyDetailsVo;
     }