Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java

@@ -85,6 +85,11 @@ public interface BaseDiscountpackageFeign {
     @GetMapping("/getAppPackage/{userSid}")
     ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(@PathVariable(value = "userSid") String userSid);
 
+    @ApiOperation("使用状态停用、开启:useState为0时走停用，为1时走开启")
+    @PostMapping("setState")
+    ResultBean setState(@RequestBody BaseDiscountpackageStateQuery query);
+
+
     /*****************************销售政策流程****************************************************/
 
     @ApiOperation("提交销售政策流程")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java

@@ -73,6 +73,11 @@ public class BaseDiscountpackageFeignFallback implements BaseDiscountpackageFeig
         return null;
     }
 
+    @Override
+    public ResultBean setState(BaseDiscountpackageStateQuery query) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(AppBaseDiscountpackageQuery appBaseDiscountpackageQuery) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageStateQuery.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.base.api.basediscountpackage;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/10/30 14:50
+ */
+@Data
+public class BaseDiscountpackageStateQuery {
+    @ApiModelProperty("sids")
+    private List<String> sidsList = new ArrayList<>();
+    @ApiModelProperty("useState为1时启用，为0时走停用")
+    private String useState;
+    private String userSid;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseApplyInboundVehQueryMaterial.java

@@ -28,4 +28,5 @@ public class BaseApplyInboundVehQueryMaterial implements Vo {
     private String settleMoney; // 结算金额
     @ApiModelProperty("仓库名称")
     private String localName; // 仓库名称
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/WithdrawalPdfVo.java

@@ -25,4 +25,5 @@ public class WithdrawalPdfVo implements Vo {
     private String makeName;
     private String confirmName;
     private List<BaseApplyInboundVehQueryMaterial> baseApplyInboundVehQueryMaterials = new ArrayList<>();
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml

@@ -75,7 +75,7 @@
         where bd.vehSid = #{vinSid}
           and bbd.useOrg = #{orgSid}
           and bbd.nodeState = '已办结'
-          and bbd.salesPolicyKey = '0001' and bbd.effectiveDate>NOW()
+          and bbd.salesPolicyKey = '0001' and bbd.effectiveDate>NOW() and isEmploy = 1
     </select>
 
     <select id="selectAppDiscountpackageListByOrgSid"

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java

@@ -146,6 +146,11 @@ public class BaseDiscountpackageRest implements BaseDiscountpackageFeign {
         return baseDiscountpackageService.getAppPackage(appBaseDiscountpackageQuery);
     }
 
+    @Override
+    public ResultBean setState(BaseDiscountpackageStateQuery query) {
+        return baseDiscountpackageService.setState(query);
+    }
+
     @Override
     public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(AppBaseDiscountpackageQuery appBaseDiscountpackageQuery) {
         return baseDiscountpackageService.getAppPackage(appBaseDiscountpackageQuery);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java

@@ -38,6 +38,8 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -48,6 +50,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -169,10 +173,10 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
             }
         }
         BaseDiscountpackage entity = new BaseDiscountpackage();
-        if (StringUtils.isBlank(dto.getDiscountMoney())){
+        if (StringUtils.isBlank(dto.getDiscountMoney())) {
             dto.setDiscountMoney("0");
         }
-        if (StringUtils.isBlank(dto.getProjectCost())){
+        if (StringUtils.isBlank(dto.getProjectCost())) {
             dto.setProjectCost("0");
         }
         BeanUtil.copyProperties(dto, entity, "sid");
@@ -427,6 +431,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         qw.eq("salesPolicyKey", "0002");
         qw.eq("nodeState", "已办结");
         qw.apply("effectiveDate > now()");
+        qw.eq("isEmploy",1);
         List<AppBaseDiscountpackageVo> voList = baseMapper.getAppPackage(qw);
         if (voList.isEmpty()) {
             voList = new ArrayList<>();
@@ -481,9 +486,9 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
         BaseDiscountpackage baseDiscountpackage1 = fetchBySid(businessSid);
-        if ("0001".equals(baseDiscountpackage1.getDiscountTypeKey())){
+        if ("0001".equals(baseDiscountpackage1.getDiscountTypeKey())) {
             variables.put("isAdj", true);
-        }else {
+        } else {
             variables.put("isAdj", false);
         }
         //用户的部门全路径sid
@@ -777,4 +782,53 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         List<BaseDiscountpackageByApplyDto> applyDtos = baseMapper.getAppPackageByUseOrg(userOrg);
         return rb.success().setData(applyDtos);
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean setState(BaseDiscountpackageStateQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        //ToDo:是否可以停用或开启，需补充条件
+        List<String> sidsList = query.getSidsList();
+        sidsList.removeAll(Collections.singleton(null));
+        if (sidsList.isEmpty()) {
+            return rb.setMsg("请选择数据");
+        }
+        String useState = query.getUseState();
+        for (String sid : sidsList) {
+            BaseDiscountpackage baseDiscountpackage = fetchBySid(sid);
+            if (baseDiscountpackage == null) {
+                return rb.setMsg("选择中包含销售政策不存在的数据，请刷新后操作");
+            }
+            if ("0".equals(query.getUseState())) {//useState为1时走停用，为0时走开启
+                if (baseDiscountpackage.getIsEmploy().equals("0")) {
+                    return rb.setMsg("该数据已是停用状态，不要重复操作");
+                }
+            }
+            if ("1".equals(query.getUseState())) {
+                if (baseDiscountpackage.getIsEmploy().equals("1")) {
+                    return rb.setMsg("该数据已是开启状态，不要重复操作");
+                }
+            }
+            if (StringUtils.isNotBlank(baseDiscountpackage.getNodeState())) {
+                if (!baseDiscountpackage.getNodeState().equals("已办结")) {
+                    return rb.setMsg("请选择已办结的数据");
+                }
+            }
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            if (StringUtils.isNotBlank(baseDiscountpackage.getEffectiveDate())) {
+                try {
+                    Date parse = sdf.parse(baseDiscountpackage.getEffectiveDate());
+                    if (parse.before(new Date())) {
+                        return rb.setMsg("请选择在有效期内的数据");
+                    }
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+            }
+            baseDiscountpackage.setIsEmploy(useState);
+            baseDiscountpackage.setModifyTime(new Date());
+            baseDiscountpackage.setUpdateBySid(query.getUserSid());
+            baseMapper.updateById(baseDiscountpackage);
+        }
+        return rb.success();
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java

@@ -79,6 +79,7 @@ import java.io.InputStream;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Project: anrui-base(厂家退库) <br/>
@@ -351,6 +352,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
         return rb.success().setData("template" + "/" + dateStr + "/" + pdfName);
     }
 
+
     /**
      * 打印退料单
      *
@@ -411,7 +413,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
         //获取车辆入库单查询
         ScmApplyInboundQueryDetailsVo scmApplyInboundQuery = scmApplyInboundQueryFeign.fetchDetailsBySid(cgrkdSid).getData();
         if (null != scmApplyInboundQuery) {
-            pdfVo.setPriceDate(scmApplyInboundQuery.getOrgPriceDate());
+            //    pdfVo.setPriceDate(scmApplyInboundQuery.getOrgPriceDate());
             pdfVo.setManPurOrderType(scmApplyInboundQuery.getManPurOrderTypeValue());
             pdfVo.setOrgDeptName(scmApplyInboundQuery.getOrgDeptName());
             pdfVo.setManName(scmApplyInboundQuery.getManName());
@@ -465,7 +467,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
         Map<String, Object> dataMap = new HashMap<String, Object>();
         //   dataMap.put("priceDate", pdfVo.getPriceDate());
         dataMap.put("exitDate", pdfVo.getExitDate());
-        dataMap.put("manPurOrderType", pdfVo.getManPurOrderType());
+        // dataMap.put("manPurOrderType", pdfVo.getManPurOrderType());
         dataMap.put("billNo", pdfVo.getBillNo());
         dataMap.put("orgDeptName", pdfVo.getOrgDeptName());
         dataMap.put("manName", pdfVo.getManName());

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusLoancontractForRepayVo.java

@@ -32,5 +32,5 @@ public class BusLoancontractForRepayVo implements Vo {
     private String bankContractNo; // 资方合同号
     @ApiModelProperty("金融产品名称")
     private String policyName; // 金融产品名称
-
+    private String orderSid;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -148,4 +148,8 @@ public interface BusSalesOrderVehicleFeign {
     @PostMapping("/selectListByOrderSidAndXdConSid")
     @ResponseBody
     ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndXdConSid(@RequestParam("saleOrderSid") String saleOrderSid,@RequestParam("loanContractSid") String loanContractSid);
+    @ApiOperation("根据消贷合同sid查车辆信息")
+    @PostMapping("/selbyContractSid")
+    @ResponseBody
+    ResultBean<List<BusSalesOrderVehicle>> selbyContractSid(@RequestParam("loanContractSid") String loanContractSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -143,4 +143,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
+    @Override
+    public ResultBean<List<BusSalesOrderVehicle>> selbyContractSid(String loanContractSid) {
+        return null;
+    }
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml

@@ -17,7 +17,7 @@
     <select id="listPageForRepay"
             resultType="com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusLoancontractForRepayVo">
         SELECT
-        bs.sid as salesOrderSid,
+        bs.sid as orderSid,
         bs.orgName as orgName,
         bs.staffName as staffName,
         bs.useOrgName as useOrgName,
@@ -25,7 +25,8 @@
         co.borrowerName as borrowerName,
         co.bankName as bankName,
         co.bankContractNo as bankContractNo,
-        co.policyName as policyName
+        co.policyName as policyName,
+        co.sid as salesOrderSid
         FROM
         bus_sales_order_loancontract AS co
         LEFT JOIN bus_sales_order AS bs ON co.salesOrderSid = bs.sid
@@ -34,7 +35,7 @@
 
     <select id="checkContractNo" resultType="java.lang.String">
         SELECT
-                RIGHT(loanContractNo,2)
+            RIGHT (loanContractNo, 2)
         FROM
             bus_sales_order_loancontract
         WHERE loanContractNo LIKE CONCAT('%', #{contractNo}, '%')

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@@ -259,7 +259,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
         if (!records.isEmpty()) {
             for (BusLoancontractForRepayVo record : records) {
                 if (StringUtils.isNotBlank(record.getSalesOrderSid())) {
-                    List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selectByOrderSid(record.getSalesOrderSid());
+                    List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selByLoanContractSid(record.getSalesOrderSid());
                     busSalesOrderVehicles.removeAll(Collections.singleton(null));
                     if (!busSalesOrderVehicles.isEmpty()) {
                         List<String> stringVinNos = busSalesOrderVehicles.stream().map(c -> c.getLinkNo()).collect(Collectors.toList());

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -167,4 +167,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     List<String> selectVinNos(@Param("borrowSid") String sid, @Param("saleOrderSid") String saleOrderSid);
 
     List<BusSalesOrderVehicle> selectListByOrderSidAndXdConSid(@Param("saleOrderSid") String saleOrderSid,@Param("loanContractSid") String loanContractSid);
+
+    @Select("select * from bus_sales_order_vehicle where loanContractSid = #{loanContractSid}")
+    List<BusSalesOrderVehicle> selByLoanContractSid(String loanContractSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java

@@ -161,4 +161,11 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
         List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selectListByOrderSidAndXdConSid(saleOrderSid, loanContractSid);
         return rb.success().setData(busSalesOrderVehicles);
     }
+
+    @Override
+    public ResultBean<List<BusSalesOrderVehicle>> selbyContractSid(String loanContractSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selByLoanContractSid(loanContractSid);
+        return rb.success().setData(busSalesOrderVehicles);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -631,4 +631,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     public List<BusSalesOrderVehicle> selectListByOrderSidAndXdConSid(String saleOrderSid, String loanContractSid) {
         return baseMapper.selectListByOrderSidAndXdConSid(saleOrderSid, loanContractSid);
     }
+
+    public List<BusSalesOrderVehicle> selByLoanContractSid(String loanContractSid) {
+        return baseMapper.selByLoanContractSid(loanContractSid);
+    }
 }

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

@@ -34,6 +34,8 @@ public class LoanRepaymentSchedule extends BaseEntity {
     private String vehCount;
     @ApiModelProperty("消贷合同编号")
     private String loanContractNo;
+    @ApiModelProperty("消贷合同sid")
+    private String loanContractSid;
     @ApiModelProperty("资方名称")
     private String bankName;
     @ApiModelProperty("金融产品政策")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@@ -478,8 +478,8 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
             zfQueryResults.add(commonAppendixVo.getFilePath());
         }
         List<LoanPreloanCreditPeoDetailsVo> loanPreloanCreditPeoDetailsVos = loanPreloanCreditPeoService.fetchByMainSid(sid);
-        List<String> idCardPeoImages = new ArrayList<>();
         for (LoanPreloanCreditPeoDetailsVo loanPreloanCreditPeoDetailsVo : loanPreloanCreditPeoDetailsVos) {
+            List<String> idCardPeoImages = new ArrayList<>();
             CommonAppendixSelectQuery commonAppendixSelectQuery3 = new CommonAppendixSelectQuery();
             commonAppendixSelectQuery3.setLinkSid(loanPreloanCreditPeoDetailsVo.getSid());
             commonAppendixSelectQuery3.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());

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

@@ -22,7 +22,7 @@ import org.apache.ibatis.annotations.Param;
 public interface LoanRepaymentScheduleMapper extends BaseMapper<LoanRepaymentSchedule> {
 
 
-    LoanRepaymentSchedule selectByOrderSid(String salesOrderSid);
+    LoanRepaymentSchedule selectByContractSid(String salesOrderSid);
 
     IPage<AppRepaymentPlanVo> getRepaymentPlanList(IPage<LoanRepaymentSchedule> page, @Param(Constants.WRAPPER) QueryWrapper<LoanWarrantInformation> qw);
 }

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

@@ -2,11 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanrepaymentschedule.LoanRepaymentScheduleMapper">
 
-    <select id="selectByOrderSid"
+    <select id="selectByContractSid"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule">
         select *
         from loan_repayment_schedule
-        where salesOrderSid = #{salesOrderSid}
+        where loanContractSid = #{salesOrderSid}
     </select>
     <select id="getRepaymentPlanList"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentschedule.AppRepaymentPlanVo">

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

@@ -8,7 +8,9 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.SolutionsDetailsssVo;
 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.BusSalesOrderLoancontractVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.buscenter.api.busvehicledatahandover.BusDataListPdfVo;
@@ -84,7 +86,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         LoanCreateSchedulePdfVo vo = new LoanCreateSchedulePdfVo();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         vo.setSalesOrderSid(salesOrderSid);
-        BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchDetailsByOrderSid(salesOrderSid).getData();
+        BusSalesOrderLoancontractDetailsVo loancontract = busSalesOrderLoancontractFeign.fetchDetailsBySid(salesOrderSid).getData();
+        String orderSid = "";
         if (null != loancontract) {
             // 消贷合同编号
             if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) {
@@ -98,11 +101,15 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
             if (StringUtils.isNotBlank(loancontract.getBorrowerName())) {
                 vo.setBorrowerName(loancontract.getBorrowerName());
             }
+            if (StringUtils.isNotBlank(loancontract.getSalesOrderSid())) {
+                orderSid = loancontract.getSalesOrderSid();
             }
-        LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(salesOrderSid);
+        }
+        if (StringUtils.isNotBlank(orderSid)) {
+            LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(orderSid);
             if (null != loanSolutions) {
                 //------金融方案-----------
-            ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsService.selectDetailss(salesOrderSid);
+                ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsService.selectDetailss(orderSid);
                 if (solutionsDetailsVoResultBean.getData() != null) {
                     LoanSolutionsDetailsssVo solutionsDetailsssVo = new LoanSolutionsDetailsssVo();
                     BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(), solutionsDetailsssVo);
@@ -122,7 +129,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 if (StringUtils.isNotBlank(loanSolutions.getLoanPeriod())) {
                     vo.setMainPeriod(loanSolutions.getLoanPeriod());
                 }
-            LoanRepaymentSchedule schedule = baseMapper.selectByOrderSid(salesOrderSid);
+                LoanRepaymentSchedule schedule = baseMapper.selectByContractSid(salesOrderSid);
                 if (null != schedule) {
                     // 主产品首期还款日
                     if (null != schedule.getMainRepayDate()) {
@@ -183,6 +190,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     }
                 }
             }
+        }
+
         return rb.success().setData(vo);
     }
 
@@ -195,7 +204,14 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
     @Transactional(rollbackFor = Exception.class)
     public ResultBean<String> loanCreateSchedulePdf(LoanCreateSchedulePdfVo dto) {
         ResultBean<String> rb = ResultBean.fireFail();
-        LoanRepaymentSchedule loanRepaymentSchedule = baseMapper.selectByOrderSid(dto.getSalesOrderSid());
+        LoanRepaymentSchedule loanRepaymentSchedule = baseMapper.selectByContractSid(dto.getSalesOrderSid());
+        String orderSid = "";
+        BusSalesOrderLoancontractDetailsVo loancontract = busSalesOrderLoancontractFeign.fetchDetailsBySid(dto.getSalesOrderSid()).getData();
+        if (null != loancontract) {
+            if (StringUtils.isNotBlank(loancontract.getSalesOrderSid())) {
+                orderSid = loancontract.getSalesOrderSid();
+            }
+        }
         if (StringUtils.isBlank(dto.getMainRepayDate())) {
             return rb.setMsg("请选择主金融产品首期还款日！");
         }
@@ -224,11 +240,15 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         }
         if (null != loanRepaymentSchedule) {
             BeanUtil.copyProperties(dto, loanRepaymentSchedule, "id", "sid");
+            loanRepaymentSchedule.setLoanContractSid(dto.getSalesOrderSid());
+            loanRepaymentSchedule.setSalesOrderSid(orderSid);
             baseMapper.updateById(loanRepaymentSchedule);
         } else {
             LoanRepaymentSchedule entity = new LoanRepaymentSchedule();
             BeanUtil.copyProperties(dto, entity, "id", "sid");
-            BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(dto.getSalesOrderSid()).getData();
+            entity.setLoanContractSid(dto.getSalesOrderSid());
+            entity.setSalesOrderSid(orderSid);
+            BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(orderSid).getData();
             if (null != busSalesOrder) {
                 if (StringUtils.isNotBlank(busSalesOrder.getCreateBySid())) {
                     entity.setStaffSid(busSalesOrder.getCreateBySid());
@@ -237,7 +257,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     entity.setStaffName(busSalesOrder.getStaffName());
                 }
             }
-            List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSid(dto.getSalesOrderSid()).getData();
+            List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selbyContractSid(dto.getSalesOrderSid()).getData();
             busSalesOrderVehicles.removeAll(Collections.singleton(null));
             if (!busSalesOrderVehicles.isEmpty()) {
                 List<String> stringVinNos = busSalesOrderVehicles.stream().map(c -> c.getLinkNo()).collect(Collectors.toList());
@@ -245,16 +265,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     entity.setVinNo(String.join(",", stringVinNos));
                 }
             }
-            BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchDetailsByOrderSid(dto.getSalesOrderSid()).getData();
-            if (null != loancontract) {
-                if (StringUtils.isNotBlank(loancontract.getBorrowerSid())) {
-                    entity.setBorrowerSid(loancontract.getBorrowerSid());
+
+            BusSalesOrderLoancontractDetailsVo loancontractVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(dto.getSalesOrderSid()).getData();
+            if (null != loancontractVo) {
+                if (StringUtils.isNotBlank(loancontractVo.getBorrowerSid())) {
+                    entity.setBorrowerSid(loancontractVo.getBorrowerSid());
                 }
-                if (StringUtils.isNotBlank(loancontract.getBankName())) {
-                    entity.setBankName(loancontract.getBankName());
+                if (StringUtils.isNotBlank(loancontractVo.getBankName())) {
+                    entity.setBankName(loancontractVo.getBankName());
                 }
-                if (StringUtils.isNotBlank(loancontract.getPolicyName())) {
-                    entity.setPolicyName(loancontract.getPolicyName());
+                if (StringUtils.isNotBlank(loancontractVo.getPolicyName())) {
+                    entity.setPolicyName(loancontractVo.getPolicyName());
                 }
             }
             baseMapper.insert(entity);
@@ -267,7 +288,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
             String pdfPath = commonCreatePdf(createScheduleVinsVo);
             String filePath = pdfPath.substring(docPdfComponent.getUploadTemplateUrl().length());
             returnPath = template + filePath;
-            LoanRepaymentSchedule entity = baseMapper.selectByOrderSid(dto.getSalesOrderSid());
+            LoanRepaymentSchedule entity = baseMapper.selectByContractSid(dto.getSalesOrderSid());
             if (null != entity) {
                 entity.setSchedulePath(filePath);
                 baseMapper.updateById(entity);
@@ -285,13 +306,33 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
     public ResultBean<LoanCreateScheduleVinsVo> viewVinsSchedule(String salesOrderSid) {
         ResultBean<LoanCreateScheduleVinsVo> rb = ResultBean.fireFail();
         LoanCreateScheduleVinsVo vo = new LoanCreateScheduleVinsVo();
-        BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchDetailsByOrderSid(salesOrderSid).getData();
+        BusSalesOrderLoancontractDetailsVo loancontract = busSalesOrderLoancontractFeign.fetchDetailsBySid(salesOrderSid).getData();
         if (null != loancontract) {
             if (StringUtils.isNotBlank(loancontract.getBankName())) {
                 vo.setBankName(loancontract.getBankName());
             }
+            if (null != loancontract.getVehCount()) {
+                vo.setVehCount(String.valueOf(loancontract.getVehCount()));
+            }
+            if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) {
+                vo.setLoanContractNo(loancontract.getLoanContractNo());
+            }
+            if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) {
+                vo.setLoanContractNo(loancontract.getLoanContractNo());
             }
-        LoanRepaymentSchedule schedule = baseMapper.selectByOrderSid(salesOrderSid);
+            if (StringUtils.isNotBlank(loancontract.getBorrowerName())) {
+                vo.setBorrowerName(loancontract.getBorrowerName());
+            }
+            List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selbyContractSid(salesOrderSid).getData();
+            busSalesOrderVehicles.removeAll(Collections.singleton(null));
+            if (!busSalesOrderVehicles.isEmpty()) {
+                List<String> stringVinNos = busSalesOrderVehicles.stream().map(c -> c.getLinkNo()).collect(Collectors.toList());
+                if (!stringVinNos.isEmpty()) {
+                    vo.setVinNo(String.join(",", stringVinNos));
+                }
+            }
+        }
+        LoanRepaymentSchedule schedule = baseMapper.selectByContractSid(salesOrderSid);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         String mainDate = "";
         String otherDate = "";
@@ -446,6 +487,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 }
             }
         }
+        vo.setSalesOrderSid(salesOrderSid);
         return rb.success().setData(vo);
     }
 
@@ -517,7 +559,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
     public ResultBean<List<LoanCreateScheduleVinOneVo>> viewVinOneSchedule(String salesOrderSid) {
         ResultBean<List<LoanCreateScheduleVinOneVo>> rb = ResultBean.fireFail();
         List<LoanCreateScheduleVinOneVo> list = new ArrayList<>();
-        LoanRepaymentSchedule schedule = baseMapper.selectByOrderSid(salesOrderSid);
+        LoanRepaymentSchedule schedule = baseMapper.selectByContractSid(salesOrderSid);
         LoanCreateScheduleVinsVo scheduleVinsVo = viewVinsSchedule(salesOrderSid).getData();
         if (null != schedule) {
             if (StringUtils.isNotBlank(schedule.getVinNo())) {
@@ -757,7 +799,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         return rb.success().setData(vo);
     }
 
-    public ResultBean<List<AppRepaymentPlanListDetailsVo>> getRepaymentPlanListByVinNo(String vinNo , String sid) {
+    public ResultBean<List<AppRepaymentPlanListDetailsVo>> getRepaymentPlanListByVinNo(String vinNo, String sid) {
         ResultBean<List<AppRepaymentPlanListDetailsVo>> rb = ResultBean.fireFail();
         AppRepaymentPlanDetailsVo data = getRepaymentPlanListBySid(sid).getData();
         if (null != data) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.java

@@ -66,6 +66,7 @@ public interface ScmApplyInboundVehQueryMapper extends BaseMapper<ScmApplyInboun
 
     @Select("select * from scm_apply_inbound_veh_query where mainSid = #{cgrkdSid}")
     List<ScmApplyInboundVehQueryDetailsVo> fetchByMainSid(String cgrkdSid);
-	@Select("select * from scm_apply_inbound_veh_query where vinNo = #{vinNo}")
+
+    @Select("SELECT * FROM scm_apply_inbound_veh_query WHERE vinNo LIKE #{vinNo}")
     ScmApplyInboundVehQueryDetailsVo fetchDetailsByVinNo(String vinNo);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryRest.java

@@ -103,7 +103,8 @@ public class ScmApplyInboundVehQueryRest implements ScmApplyInboundVehQueryFeign
 	@GetMapping("/fetchDetailsByVinNo")
 	public ResultBean<ScmApplyInboundVehQueryDetailsVo> fetchDetailsByVinNo(String vinNo) {
 		ResultBean rb = ResultBean.fireFail();
-		ScmApplyInboundVehQueryDetailsVo vo = scmApplyInboundVehQueryService.fetchDetailsByVinNo(vinNo);
+		String substringVinNo = vinNo.substring(vinNo.length() - 8);
+		ScmApplyInboundVehQueryDetailsVo vo = scmApplyInboundVehQueryService.fetchDetailsByVinNo(substringVinNo);
 		return rb.success().setData(vo);
 	}
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java

@@ -434,7 +434,7 @@ public class CreditReviewService {
             IdentityDetailsVo identityDetailsVo = new IdentityDetailsVo();
             identityDetailsVo.setSid(loanFinBanksVo.getSid());
             identityDetailsVo.setDictKey(loanFinBanksVo.getSid());
-            identityDetailsVo.setDictValue(loanFinBanksVo.getBankName());
+            identityDetailsVo.setDictValue(loanFinBanksVo.getName());
             identityDetailsVos.add(identityDetailsVo);
         }
         return rb.success().setData(identityDetailsVos);