From 6d3e726f4cf8ccf6846c87c874c6eb2f2a79832d Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Thu, 4 Jan 2024 11:54:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E8=BD=AC=E4=BB=98=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=98=E6=AC=BE=E6=96=B9=E5=BC=8F=E4=B8=BA?=
 =?UTF-8?q?=E9=97=B4=E8=BF=98=E4=B8=94(=E6=9C=AA=E5=9E=AB=E6=AC=BE?=
 =?UTF-8?q?=E6=88=96=E4=B8=AD=E8=BD=A6=E7=B1=BB=E8=B5=84=E6=96=B9)=20?=
 =?UTF-8?q?=E3=80=81=E8=BD=AC=E4=BB=98=E7=8A=B6=E6=80=81=E4=B8=BA=E5=BE=85?=
 =?UTF-8?q?=E8=BD=AC=E4=BB=98=E3=80=81=E8=BD=AC=E4=BB=98=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 87b34fdfa8..55ec55039d 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
@@ -167,6 +167,9 @@
         loan_repayment_history AS h
         LEFT JOIN loan_repayment_plan_details AS p ON h.planDetailSid = p.sid
         LEFT JOIN loan_transfer_payment_record AS r ON h.sid = r.repaymentHistorySid
+        LEFT JOIN loan_solutions as s ON p.salesOrderSid = s.salesOrderSid
+        LEFT JOIN loan_fin_policy as po ON s.policySid = po.sid
+        LEFT JOIN loan_fin_bank as b ON b.sid = po.bankSid
         <where>
             ${ew.sqlSegment}
         </where>
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 f9dbb8170a..535dd3dc0d 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
@@ -934,7 +934,8 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         if (StringUtils.isNotBlank(pagerQuery.getType())) {
             String type = pagerQuery.getType();
             if (type.equals("0")) {
-                qw.eq("h.paymentStateKey", "001").or().eq("h.paymentStateKey", "002");
+                //  qw.eq("h.paymentStateKey", "001").or().eq("h.paymentStateKey", "002");
+                qw.apply("(h.paymentStateKey = '001' OR h.paymentStateKey = '002')");
             } else if (type.equals("1")) {
                 qw.eq("h.paymentStateKey", "003");
             }
@@ -975,6 +976,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         qw.apply(StringUtils.isNotEmpty(prepareStartDate), "date_format (h.prepareDate,'%Y-%m-%d') >= date_format('" + prepareStartDate + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(prepareEndDate), "date_format (h.prepareDate,'%Y-%m-%d') <= date_format('" + prepareEndDate + "','%Y-%m-%d')"
                 );
+        qw.apply("(b.reAdvances = '1' OR IFNULL(p.paymentMoney,0) <= 0)");
         IPage<TransferPaymentVo> pagging = baseMapper.transferPaymentList(page, qw);
         PagerVo<TransferPaymentVo> p = PagerUtil.pageToVo(pagging, null);
         return p;