From c0abbc394a9d813c7eb4e3e5f227ebbc8c0a45c7 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 7 Aug 2024 11:54:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=B7=E5=90=8E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E5=85=A5=E7=AE=97=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanCreateSchedulePdfVo.java              |  4 +++
 .../LoanRepaymentSchedule.java                |  4 +++
 .../LoanRepaymentHistoryMapper.xml            | 15 +++++------
 .../LoanRepaymentPlanDetailsMapper.xml        | 25 ++++++-------------
 .../LoanRepaymentScheduleMapper.xml           |  4 +--
 .../LoanRepaymentScheduleService.java         | 12 +++++++++
 6 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanCreateSchedulePdfVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanCreateSchedulePdfVo.java
index 661e7230e5..f1497c627b 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanCreateSchedulePdfVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanCreateSchedulePdfVo.java
@@ -75,4 +75,8 @@ public class LoanCreateSchedulePdfVo implements Vo {
     private String singleOtherMidRepay;
     @ApiModelProperty("单独其他融末期月还")
     private String singleOtherLastRepay;
+    @ApiModelProperty("主产品资方sid")
+    private String bankSid;
+    @ApiModelProperty("其他融资方sid")
+    private String otherBankSid;
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentSchedule.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentSchedule.java
index 62aed25146..2df417c9b7 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentSchedule.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentSchedule.java
@@ -98,4 +98,8 @@ public class LoanRepaymentSchedule extends BaseEntity {
     private BigDecimal importFund;
     @ApiModelProperty("全路径")
     private String orgSidPath;
+    @ApiModelProperty("主产品资方sid")
+    private String bankSid;
+    @ApiModelProperty("其他融资方sid")
+    private String otherBankSid;
 }
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 7f8463dd53..edae0fd4a1 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
@@ -256,9 +256,8 @@
         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
+        LEFT JOIN loan_repayment_schedule as s ON p.scheduleSid = s.sid
+        LEFT JOIN loan_fin_bank as b ON b.sid = s.bankSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -841,9 +840,8 @@
         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,
+        LEFT JOIN loan_repayment_schedule as s ON p.scheduleSid = s.sid
+        LEFT JOIN loan_fin_bank as b ON b.sid = s.bankSid,
         (
         SELECT
         @row_number := 0
@@ -882,9 +880,8 @@
         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,
+        LEFT JOIN loan_repayment_schedule as s ON p.scheduleSid = s.sid
+        LEFT JOIN loan_fin_bank as b ON b.sid = s.bankSid,
         (
         SELECT
         @row_number := 0
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
index ac7edbb2ed..b826be01bc 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
@@ -225,10 +225,8 @@
                    ELSE '1'
                    END as h
         FROM loan_repayment_plan_details as p
-                 LEFT JOIN loan_solutions as s ON p.salesOrderSid = s.salesOrderSid
-                 LEFT JOIN loan_fin_policy as py ON s.policySid = py.sid
-                 LEFT JOIN loan_fin_bank as b ON b.sid = py.bankSid
-        where s.isDelete = 0
+                 LEFT JOIN loan_repayment_schedule as s ON p.scheduleSid = s.sid
+                 LEFT JOIN loan_fin_bank as b ON b.sid = s.bankSid
           and p.sid = #{pSid}
     </select>
     <select id="selDifference" resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.DifferenceVo">
@@ -258,11 +256,9 @@
                    ELSE '1'
                    END AS h
         FROM loan_repayment_plan_details AS p
-                 LEFT JOIN loan_solutions AS s ON p.salesOrderSid = s.salesOrderSid
-                 LEFT JOIN loan_fin_policy AS py ON s.policySid = py.sid
-                 LEFT JOIN loan_fin_bank AS b ON b.sid = py.bankSid
+                 LEFT JOIN loan_repayment_schedule AS s ON p.scheduleSid = s.sid
+                 LEFT JOIN loan_fin_bank AS b ON b.sid = s.bankSid
         WHERE p.sid = #{sid}
-          AND s.isDelete = 0
     </select>
     <select id="getListByBusVinSid"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails">
@@ -439,21 +435,16 @@
     <select id="getMainBankName" resultType="java.lang.String">
         SELECT b.bankShortName
         FROM loan_repayment_plan_details as p
-                 LEFT JOIN loan_solutions as s ON p.salesOrderSid = s.salesOrderSid
-                 LEFT JOIN loan_fin_policy as po ON po.sid = s.policySid
-                 LEFT JOIN loan_fin_bank as b ON po.bankSid = b.sid
+                 LEFT JOIN loan_repayment_schedule as s ON p.scheduleSid = s.sid
+                 LEFT JOIN loan_fin_bank as b ON s.bankSid = b.sid
         WHERE p.sid = #{sid}
-          AND s.isDelete = '0'
     </select>
     <select id="getOtherBankName" resultType="java.lang.String">
         SELECT b.bankShortName
         FROM loan_repayment_plan_details AS p
-                 LEFT JOIN loan_solutions AS s ON p.salesOrderSid = s.salesOrderSid
-                 LEFT JOIN loan_solutions_otherpolicy AS o ON s.sid = o.solutionsSid
-                 LEFT JOIN loan_fin_otherpolicy AS po ON po.sid = o.otherPolicySid
-                 LEFT JOIN loan_fin_bank AS b ON po.bankSid = b.sid
+                 LEFT JOIN loan_repayment_schedule AS s ON p.scheduleSid = s.sid
+                 LEFT JOIN loan_fin_bank AS b ON s.otherBankSid = b.sid
         WHERE p.sid = #{sid}
-          AND s.isDelete = '0'
     </select>
     <select id="checkOverDue"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsForOverDue">
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml
index daf4d37be1..a38814bd74 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml
@@ -6,7 +6,7 @@
         vehCount,vinNo,loanContractSid,loanContractNo,bankContractNo,bankName,policyName,mainPeriod,mainRepayDate,
         mainLastDate,mainFirstRepay,mainMidRepay,mainLastRepay,otherPeriod,otherBankNo,otherRepayDate,otherFirstRepay,
         otherMidRepay,otherLastRepay,isOtherPolicy,sameBank,cwDeptNo,isDifferent,importTiredMoney,importPaymentMoney,
-        importInterest,importFund,orgSidPath)
+        importInterest,importFund,orgSidPath,bankSid,otherBankSid)
         values
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.createBySid},#{item.sid},#{item.createTime},#{item.isEnable},#{item.salesOrderSid},#{item.borrowerSid},#{item.borrowerName},
@@ -14,7 +14,7 @@
             #{item.policyName},#{item.mainPeriod},#{item.mainRepayDate},#{item.mainLastDate},#{item.mainFirstRepay},#{item.mainMidRepay},
             #{item.mainLastRepay},#{item.otherPeriod},#{item.otherBankNo},#{item.otherRepayDate},#{item.otherFirstRepay},#{item.otherMidRepay},
             #{item.otherLastRepay},#{item.isOtherPolicy},#{item.sameBank},#{item.cwDeptNo},#{item.isDifferent},#{item.importTiredMoney},
-            #{item.importPaymentMoney},#{item.importInterest},#{item.importFund},#{item.orgSidPath}
+            #{item.importPaymentMoney},#{item.importInterest},#{item.importFund},#{item.orgSidPath},#{item.bankSid},#{item.otherBankSid}
              )
         </foreach>
     </insert>
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 76e8041b21..885dde6fe8 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
@@ -198,6 +198,13 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     LoanSolutionsDetailsssVo solutionsDetailsssVo = new LoanSolutionsDetailsssVo();
                     BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(), solutionsDetailsssVo);
                     vo.setSolutionsDetailsssVo(solutionsDetailsssVo);
+                    String policySid = solutionsDetailsVoResultBean.getData().getPolicySid();
+                    LoanFinPolicy finPolicy = loanFinPolicyService.fetchBySid(policySid);
+                    if (null != finPolicy) {
+                        if (StringUtils.isNotBlank(finPolicy.getBankSid())) {
+                            vo.setBankSid(finPolicy.getBankSid());
+                        }
+                    }
                 }
                 // 产品方案sid
                 vo.setSolutionsSid(loanSolutions.getSid());
@@ -268,6 +275,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                         if (loanFinOtherPolicy != null) {
                             if (StringUtils.isNotBlank(loanFinOtherPolicy.getBankSid())) {
                                 otherBankSid = loanFinOtherPolicy.getBankSid();
+                                vo.setOtherBankSid(otherBankSid);
                             }
                         }
                         String finBankSid = "";
@@ -5303,6 +5311,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 scheduleDetails.setImportPaymentMoney(new BigDecimal(T));
                 scheduleDetails.setImportInterest(new BigDecimal(L));
                 scheduleDetails.setImportFund(new BigDecimal(B));
+                scheduleDetails.setBankSid(bankSid);
+                scheduleDetails.setOtherBankSid(otherBankSid);
                 scheduleDetails.setIsEnable(3);
                 schedules.add(scheduleDetails);
                 returnList.add(scheduleDetails);
@@ -5502,6 +5512,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 schedule.setImportInterest(new BigDecimal(L));
                 schedule.setImportFund(new BigDecimal(B));
                 schedule.setCwDeptNo(salesDeptNo);
+                schedule.setBankSid(bankSid);
+                schedule.setOtherBankSid(otherBankSid);
                 schedule.setIsEnable(2);
                 schedules.add(schedule);
             }