修改根据车架号查询销售订单

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/VehicleCustomerVo.java

@@ -8,5 +8,6 @@ public class VehicleCustomerVo {
     private String customerSid;
     private String saleDate;
     private String useOrgName;
+    private String orderSid;
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml

@@ -82,10 +82,12 @@
         SELECT
             date_format (o.createTime,'%Y-%m-%d') saleDate,
             a.customerSid,
-            s.`name` useOrgName
+            s.`name` useOrgName,
+            so.sid as orderSid
         FROM
             base_vehicle_out AS o
                 LEFT JOIN base_vehicle_out_apply AS a ON o.mainSid = a.sid
+                LEFT JOIN anrui_buscenter.bus_sales_order AS so ON so.contractNo = a.contractNo
                 LEFT JOIN anrui_portal.sys_organization AS s ON s.sid = a.createOrgSid
         WHERE o.isDelete = '0' AND o.vinNo LIKE CONCAT( '%', #{vinNo}, '%' )
     </select>

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

@@ -10,12 +10,16 @@ import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeign;
+import com.yxt.anrui.base.api.basevehicleoutapply.VehicleCustomerVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
-import com.yxt.anrui.buscenter.api.bussalesorderloancontract.*;
+import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontract;
+import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderloancontract.LoanRepaymentPlanDetailsExportVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
@@ -29,7 +33,6 @@ import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUser;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
@@ -69,8 +72,6 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.PushMessageQuery;
 import com.yxt.messagecenter.api.message.PushSmsDto;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.time.DateUtils;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
@@ -5120,7 +5121,9 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 customerTemps.add(crmCustomerTemp);
             }
             //根据车架号查询销售订单
-            String orderSid = baseVehicleOutApplyFeign.selectSidByVinNo(vinNo).getData();
+            VehicleCustomerVo vehicleCustomerVo = baseVehicleOutApplyFeign.selectSidByVinNo(vinNo).getData();
+            if (null != vehicleCustomerVo) {
+                String orderSid = vehicleCustomerVo.getOrderSid();
                 if (StringUtils.isNotBlank(orderSid)) {
                     salesOrderSid = orderSid;
                     // 查询销售订单车辆列表
@@ -5327,6 +5330,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     busSalesOrderVehicle.setCreateBySid(userSid);
                     vehicles.add(busSalesOrderVehicle);
                 }
+            }
+
             //生成还款计划主表及还款计划表明细
             if (sleep.equals("否")) {
                 LoanRepaymentSchedule scheduleDetails = new LoanRepaymentSchedule();