Merge remote-tracking branch 'origin/master'

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

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>

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 = "";