Merge remote-tracking branch 'origin/master'

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

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);