Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java

@@ -223,7 +223,7 @@ public class LoanLawsuitApplyService extends MybatisBaseService<LoanLawsuitApply
             }
             for (LoanLawsuitVehVo veh : vehList) {
                 String busVinSid = veh.getBusVinSid();
-                AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr(busVinSid);
+                AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr2(busVinSid);
                 if (null != alrepaidAndArr) {
                     //已还金额
                     if (StringUtils.isNotBlank(alrepaidAndArr.getAlRepaidMoney())) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java

@@ -271,7 +271,7 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
                 if (StringUtils.isNotBlank(rkSid)) {
                     vo.setRksqSid(rkSid);
                 }
-                AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr(redemptionInitVo.getBusVinSid());
+                AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr2(redemptionInitVo.getBusVinSid());
                 if (null != alrepaidAndArr) {
                     //已还金额
                     if (StringUtils.isNotBlank(alrepaidAndArr.getAlRepaidMoney())) {
@@ -500,7 +500,7 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
                 if (StringUtils.isNotBlank(rkSid)) {
                     vo.setRksqSid(rkSid);
                 }
-                AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr(vo.getBusVinSid());
+                AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr2(vo.getBusVinSid());
                 if (null != alrepaidAndArr) {
                     //已还金额
                     if (StringUtils.isNotBlank(alrepaidAndArr.getAlRepaidMoney())) {
@@ -1215,7 +1215,7 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
                 if (StringUtils.isNotBlank(rkSid)) {
                     vo.setRksqSid(rkSid);
                 }
-                AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr(vo.getCsjlSid());
+                AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr2(vo.getCsjlSid());
                 if (null != alrepaidAndArr) {
                     String allPeriod = "";
                     String nowBeMoney = "";