修改贷后数据导入

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentSchedule.java

@@ -96,4 +96,6 @@ public class LoanRepaymentSchedule extends BaseEntity {
     private BigDecimal importInterest;
     @ApiModelProperty("导入资金占用费")
     private BigDecimal importFund;
+    @ApiModelProperty("全路径")
+    private String orgSidPath;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml

@@ -284,8 +284,8 @@
         SELECT
         pd.busVinSid,
         pd.dueDate,
-        s.createBySid,
-        s.orgSidPath,
+        pd.createBySid,
+        pd.orgSidPath,
         pd.sid,
         pd.useOrgName,
         pd.dept,
@@ -314,7 +314,6 @@
         END AS returnState
         FROM
         loan_repayment_plan_details AS pd
-        LEFT JOIN anrui_buscenter.bus_sales_order AS s ON s.sid = pd.salesOrderSid
         LEFT JOIN (
         SELECT
         p.sid,
@@ -432,8 +431,8 @@
         (
         SELECT
         pd.dueDate,
-        s.createBySid,
-        s.orgSidPath,
+        pd.createBySid,
+        pd.orgSidPath,
         pd.sid,
         pd.useOrgName,
         pd.dept,
@@ -461,7 +460,6 @@
         END AS returnState
         FROM
         loan_repayment_plan_details AS pd
-        LEFT JOIN anrui_buscenter.bus_sales_order AS s ON s.sid = pd.salesOrderSid
         LEFT JOIN loan_be_padsincere_veh AS v ON v.saleVehSid = pd.busVinSid
         LEFT JOIN (
         SELECT
@@ -674,8 +672,8 @@
         SELECT
         pd.busVinSid,
         pd.dueDate,
-        s.createBySid,
-        s.orgSidPath,
+        pd.createBySid,
+        pd.orgSidPath,
         pd.sid,
         pd.useOrgName,
         pd.dept,
@@ -707,7 +705,6 @@
         END AS returnState
         FROM
         loan_repayment_plan_details AS pd
-        LEFT JOIN anrui_buscenter.bus_sales_order AS s ON s.sid = pd.salesOrderSid
         LEFT JOIN (
         SELECT
         p.sid,

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)
+        importInterest,importFund,orgSidPath)
         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.importPaymentMoney},#{item.importInterest},#{item.importFund},#{item.orgSidPath}
              )
         </foreach>
     </insert>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -5257,6 +5257,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
             if (sleep.equals("否")) {
                 LoanRepaymentSchedule scheduleDetails = new LoanRepaymentSchedule();
                 scheduleDetails.setCreateBySid(userSid);
+                scheduleDetails.setOrgSidPath(orgPath);
                 String scheduleSid = scheduleDetails.getSid();
                 scheduleDetails.setIsOtherPolicy(isOther);
                 scheduleDetails.setSameBank(sameBank);
@@ -5577,7 +5578,6 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
             System.out.println("============================");
             System.out.println(schedules);
             System.out.println("============================");
-
             generateHistoryData(schedules, userSid);
         } catch (Exception e) {
             e.printStackTrace();
@@ -5650,20 +5650,13 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                             importSleepData.setPolicyOrOther("1");
                         }
                         String salesOrderSid = mainSchedule.getSalesOrderSid();
-                        BusSalesOrder order = busSalesOrderFeign.fetchBySid(salesOrderSid).getData();
-                        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());
-                            }
+                        String orgSidPath = mainSchedule.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) {