From 37d93f3674e976ae0652c6146fc03a40987bfcb8 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 22 Jan 2024 10:45:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E6=AC=BE=E8=AE=A1=E5=88=92=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=9B=B4=E6=96=B0=E6=97=A5=E6=9C=9F=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml | 6 ++++--
 .../loanrepaymenthistory/LoanRepaymentHistoryService.java   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
index 850333470a..a6e7c27224 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
@@ -179,8 +179,10 @@
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.RepaymentStatisticsVo">
         SELECT DISTINCT
         a.*,
-        (SELECT c.bankBeInter FROM loan_be_padsincere_veh as c WHERE c.saleVehSid = a.busVinSid AND c.period = a.period)
-        as bankBeInter
+        IFNULL((SELECT SUM(c.bankBeInter) FROM loan_be_padsincere_apply as ap
+        LEFT JOIN  loan_be_padsincere_veh as c on ap.sid = c.mainSid
+        WHERE c.saleVehSid = a.busVinSid AND c.period = a.period AND ap.nodeState = '已办结'
+        ),0) as bankBeInter
         FROM
         (
         SELECT
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
index 620cec5d9e..b9f96a09a4 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
@@ -773,7 +773,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                         Date today = new Date();
                         String f = sdf.format(today);
                         Date date = sdf.parse(f);
-                        if (u.compareTo(date) == 0) {
+                        if (u.compareTo(date) >= 0) {
                             Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
                             cal_1.setTime(date);
                             cal_1.add(Calendar.DAY_OF_MONTH, -1);