From 1365e60da7575671d2e46160499ef54a541d4361 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 24 Jan 2024 15:46:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E5=9B=9E=E8=BD=A6=E8=BE=86=E8=B5=8E?=
 =?UTF-8?q?=E5=9B=9E=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanRedemptionApplyMapper.java                   |  2 ++
 .../LoanRedemptionApplyMapper.xml                    |  6 ++++++
 .../LoanRedemptionApplyService.java                  | 12 ++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.java
index 24d6d91a96..4142e98a5e 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.java
@@ -36,4 +36,6 @@ public interface LoanRedemptionApplyMapper extends BaseMapper<LoanRedemptionAppl
     VehDisposal selVehDisposal(@Param("ledgerSid") String ledgerSid);
 
     LoanReturnVehLedger selVehLedgerBySid(@Param("ledgerSid") String ledgerSid);
+
+    String selVehRkSid(@Param("busVinSid") String busVinSid);
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.xml
index 8ac1cef84b..adaa91b37a 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.xml
@@ -118,4 +118,10 @@
         FROM loan_return_veh_ledger
         WHERE sid = #{ledgerSid}
     </select>
+    <select id="selVehRkSid" resultType="java.lang.String">
+        select sid
+        from loan_return_inbound_apply
+        where nodeState = '已办结'
+          and busVinSid = #{busVinSid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java
index e3a2502b26..f7e890712e 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java
@@ -267,6 +267,10 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
         if (null != redemptionInitVo) {
             BeanUtil.copyProperties(redemptionInitVo, vo);
             if (StringUtils.isNotBlank(redemptionInitVo.getBusVinSid())) {
+                String rkSid = baseMapper.selVehRkSid(redemptionInitVo.getBusVinSid());
+                if (StringUtils.isNotBlank(rkSid)) {
+                    vo.setRksqSid(rkSid);
+                }
                 AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr(redemptionInitVo.getBusVinSid());
                 if (null != alrepaidAndArr) {
                     //已还金额
@@ -492,6 +496,10 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
                 vo.setVinList(redemptionVinLists);
             }
             if (StringUtils.isNotBlank(vo.getBusVinSid())) {
+                String rkSid = baseMapper.selVehRkSid(vo.getBusVinSid());
+                if (StringUtils.isNotBlank(rkSid)) {
+                    vo.setRksqSid(rkSid);
+                }
                 AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr(vo.getBusVinSid());
                 if (null != alrepaidAndArr) {
                     //已还金额
@@ -1203,6 +1211,10 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
                 vo.setVinList(vinList);
             }
             if (StringUtils.isNotBlank(vo.getCsjlSid())) {
+                String rkSid = baseMapper.selVehRkSid(vo.getCsjlSid());
+                if (StringUtils.isNotBlank(rkSid)) {
+                    vo.setRksqSid(rkSid);
+                }
                 AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr(vo.getCsjlSid());
                 if (null != alrepaidAndArr) {
                     String allPeriod = "";