|
|
@ -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.getCustomerSid())) { |
|
|
|
customerSid = order.getCustomerSid(); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(order.getUseOrgSid())) { |
|
|
|
importSleepData.setUseOrgSid(order.getUseOrgSid()); |
|
|
|
if (StringUtils.isNotBlank(order.getCustomerName())) { |
|
|
|
customerName = order.getCustomerName(); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(order.getOrgSidPath())) { |
|
|
|
importSleepData.setOrgSidPath(order.getOrgSidPath()); |
|
|
|
} |
|
|
|
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 + "不存在,请先导入还款计划主表"); |
|
|
|
} |
|
|
|