From 9c353ca470e8ff6326243d250263d87083ea0e3e Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 17 Jul 2024 14:48:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E6=AC=BE=E8=AE=B0=E5=BD=95=E8=BF=9E?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=AC=BE=E9=A1=B9=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml  | 5 ++++-
 .../loanrepaymentschedule/LoanRepaymentScheduleService.java  | 2 +-
 2 files changed, 5 insertions(+), 2 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 8b5898ad3e..24601748c7 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
@@ -903,12 +903,15 @@
                 d.period,
                 h.actualDate,
                 h.actualMoney,
-                h.returnWay
+                h.returnWay,
+                fj.payCostTitleValue AS kxType
         FROM
                 loan_repayment_history h
                         LEFT JOIN loan_repayment_plan_details d
                         ON h.planDetailSid = d.sid
                                 AND h.scheduleSid = d.scheduleSid
+                        LEFT JOIN anrui_fin.fin_uncollected_receivables_detailed_jr fj
+                        ON d.sid = fj.`busSid`
         WHERE d.vinNo = #{vinNo}
           AND h.scheduleSid = #{scheduleSid}
     </select>
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
index 1757ce913a..cfb2cb4d0f 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
@@ -7055,7 +7055,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         AppRepaymentHistoryThead appRepaymentHistoryThead2 = new AppRepaymentHistoryThead();
         appRepaymentHistoryThead2.setName("kxType");
         appRepaymentHistoryThead2.setLabel("款项类别");
-        appRepaymentHistoryThead2.setWidth("80");
+        appRepaymentHistoryThead2.setWidth("120");
         appRepaymentHistoryThead2.setEmptyString("-");
         appRepaymentHistoryThead2.setAlign("center");
         appRepaymentHistoryTheads.add(appRepaymentHistoryThead2);