From 017788e4069a189f9589e483c0a4c8c0b36266e4 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 26 Jul 2024 15:15:24 +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=E7=AE=97=E6=B3=95=E8=8E=B7=E5=8F=96=E5=AE=A2=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/bussalesorder/BusSalesOrderMapper.xml |  4 +-
 .../historyData/ImportSleepData.java          |  2 +
 .../LoanRepaymentScheduleService.java         | 44 ++++++++++++++-----
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
index 5b52e47776..9ac4c4614f 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
@@ -3,11 +3,11 @@
 <mapper namespace="com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderMapper">
     <insert id="saveList">
         insert into bus_sales_order(createBySid,sid,createTime,payType,payTypeKey,financePlan,financePlanValue,
-        isEnable,customerSid,useOrgSid,useOrgName,orgSid,orgName,orgSidPath)
+        isEnable,customerSid,customerName,useOrgSid,useOrgName,orgSid,orgName,orgSidPath)
         values
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.createBySid},#{item.sid},#{item.createTime},#{item.payType},#{item.payTypeKey},#{item.financePlan},#{item.financePlanValue},
-            #{item.isEnable},#{item.customerSid},#{item.useOrgSid},#{item.useOrgName},#{item.orgSid},#{item.orgName},#{item.orgSidPath})
+            #{item.isEnable},#{item.customerSid},#{item.customerName},#{item.useOrgSid},#{item.useOrgName},#{item.orgSid},#{item.orgName},#{item.orgSidPath})
         </foreach>
     </insert>
     <!--    <where> ${ew.sqlSegment} </where>-->
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ImportSleepData.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ImportSleepData.java
index 2a8f7bd3dc..a6b37872e2 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ImportSleepData.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ImportSleepData.java
@@ -40,4 +40,6 @@ public class ImportSleepData {
     private String loanContractNo;
     private String bankName;
     private String salesOrderSid;
+    private String customerSid;
+    private String customer;
 }
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 6036252375..8e7e764f36 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
@@ -5200,6 +5200,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 busSalesOrder.setFinancePlan("01");
                 busSalesOrder.setFinancePlanValue("担保");
                 busSalesOrder.setCustomerSid(customerSid);
+                busSalesOrder.setCustomerName(customerName);
                 busSalesOrder.setUseOrgSid(useOrgSid);
                 busSalesOrder.setUseOrgName(useOrgName);
                 busSalesOrder.setOrgSid(deptSid);
@@ -5655,6 +5656,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                         }
                         String salesOrderSid = mainSchedule.getSalesOrderSid();
                         String orgSidPath = mainSchedule.getOrgSidPath();
+                        String customerSid = "";
+                        String customerName = "";
+                        BusSalesOrder order = busSalesOrderFeign.fetchBySid(salesOrderSid).getData();
+                        if (null != order) {
+                            if (StringUtils.isNotBlank(order.getCustomerSid())) {
+                                customerSid = order.getCustomerSid();
+                            }
+                            if (StringUtils.isNotBlank(order.getCustomerName())) {
+                                customerName = order.getCustomerName();
+                            }
+                        }
                         SysOrganizationVo deptData = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
                         if (null != deptData) {
                             importSleepData.setDeptSid(deptData.getSid());
@@ -5679,6 +5691,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                             importSleepData.setBankContractNo(mainSchedule.getBankContractNo());
                         }
                         importSleepData.setSalesOrderSid(mainSchedule.getSalesOrderSid());
+                        importSleepData.setCustomer(customerName);
+                        importSleepData.setCustomerSid(customerSid);
                         if (StringUtils.isNotBlank(mainSchedule.getBankName())) {
                             importSleepData.setBankName(mainSchedule.getBankName());
                         }
@@ -5691,19 +5705,23 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                             }
                             String salesOrderSid = otherSchedule.getSalesOrderSid();
                             BusSalesOrder order = busSalesOrderFeign.fetchBySid(salesOrderSid).getData();
+                            String customerSid = "";
+                            String customerName = "";
                             if (null != order) {
-                                if (StringUtils.isNotBlank(order.getOrgSid())) {
-                                    importSleepData.setDeptSid(order.getOrgSid());
-                                }
-                                if (StringUtils.isNotBlank(order.getOrgName())) {
-                                    importSleepData.setDept(order.getOrgName());
-                                }
-                                if (StringUtils.isNotBlank(order.getUseOrgSid())) {
-                                    importSleepData.setUseOrgSid(order.getUseOrgSid());
-                                }
-                                if (StringUtils.isNotBlank(order.getOrgSidPath())) {
-                                    importSleepData.setOrgSidPath(order.getOrgSidPath());
-                                }
+                                    if (StringUtils.isNotBlank(order.getCustomerSid())) {
+                                        customerSid = order.getCustomerSid();
+                                    }
+                                    if (StringUtils.isNotBlank(order.getCustomerName())) {
+                                        customerName = order.getCustomerName();
+                                    }
+                            }
+                            String orgSidPath = otherSchedule.getOrgSidPath();
+                            SysOrganizationVo deptData = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
+                            if (null != deptData) {
+                                importSleepData.setDeptSid(deptData.getSid());
+                                importSleepData.setDept(deptData.getName());
+                                importSleepData.setUseOrgSid(deptData.getPsid());
+                                importSleepData.setOrgSidPath(orgSidPath);
                             }
                             BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.selByOrderSidAndVinNo(salesOrderSid, vinNo).getData();
                             if (null != orderVehicle) {
@@ -5724,6 +5742,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                 importSleepData.setBankContractNo(otherSchedule.getOtherBankNo());
                             }
                             importSleepData.setSalesOrderSid(otherSchedule.getSalesOrderSid());
+                            importSleepData.setCustomer(customerName);
+                            importSleepData.setCustomerSid(customerSid);
                         } else {
                             setMsg.add("资方合同号" + bankContractNo + ",车架号" + vinNo + "不存在，请先导入还款计划主表");
                         }