Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseJRFAVo.java

@@ -0,0 +1,168 @@
+package com.yxt.anrui.base.api.basevehicleout;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class BaseJRFAVo {
+    @ApiModelProperty("融资项目")
+    private String financProject;
+    @ApiModelProperty("是否显示更多")
+    @JsonProperty("isShowMore")
+    private boolean isShowMore;
+
+    @ApiModelProperty("关联sid")
+    private String busSid;
+    @ApiModelProperty("是否打包：1打包，0不打包")
+    private String isPack;
+    @ApiModelProperty("产品政策名称")
+    private String policyName;
+    @ApiModelProperty("产品政策sid")
+    private String policySid;
+    @ApiModelProperty("融资项目总额")
+    private String loanTotal;
+    @ApiModelProperty("主车发票价")
+    private String mainVehicleAmount;
+    @ApiModelProperty("配件")
+    private String accessoriesAmount;
+    @ApiModelProperty("是否有配件")
+    private boolean accessoriesAmountCb;
+    @ApiModelProperty("挂车金额")
+    private String trailerAmount;
+    @ApiModelProperty("是否有挂车")
+    private boolean trailerAmountCb;
+    @ApiModelProperty("购置税")
+    private String purchaseTax;
+    @ApiModelProperty("是否有购置税")
+    private boolean purchaseTaxCb;
+    @ApiModelProperty("保险金额")
+    private String premium;
+    @ApiModelProperty("是否有保险")
+    private boolean premiumCb;
+    @ApiModelProperty("首付款比例")
+    private String downPayRatio;
+    @ApiModelProperty("首付金额")
+    private String downPayAmount;
+    @ApiModelProperty("贷款金额")
+    private String loanAmount;
+    @ApiModelProperty("贷款期数")
+    private String loanPeriod;
+    @ApiModelProperty("保证金比例")
+    private String bondRatio;
+    @ApiModelProperty("保证金金额")
+    private String bondAmount;
+    @ApiModelProperty("厂家贴息")
+    private String factoryDiscount;
+    @ApiModelProperty("厂家贴息用途")
+    private String factoryDiscountUse;
+    @ApiModelProperty("年利率")
+    private String policyYearRatio;
+    @ApiModelProperty("贷款月还")
+    private String loanPayMoney;
+    @ApiModelProperty("贷款利息")
+    private String loanInterest;
+    @ApiModelProperty("贴息抵车款")
+    private String discountCar;
+    @ApiModelProperty("是否勾选其它融")
+    private boolean otherPolicyState;
+    /**************************其他融*********************************/
+    private boolean otherPolicyIsMain;
+    @ApiModelProperty("其它融名称")
+    private String otherPolicyName;
+    @ApiModelProperty("其他融sid")
+    private String otherPolicySid;
+    @ApiModelProperty("其它融金额")
+    private String otherPolicyAmount;
+    @ApiModelProperty("其它融期数")
+    private String otherPolicyPeriod;
+    @ApiModelProperty("其它融月还")
+    private String otherPolicyMonthlyRepay;
+    @ApiModelProperty("其它融利息总额")
+    private String otherPolicyInterest;
+    @ApiModelProperty("其它融年利率")
+    private String otherPolicyYearRatio;
+    /*************************方案汇总*********************************/
+    @ApiModelProperty("'融资首付")
+    private String loanDownPay;
+    @ApiModelProperty("总贷款金额")
+    private String loanAmountTotal;
+    @ApiModelProperty("期数")
+    private String period;
+    @ApiModelProperty("月还金额")
+    private String monthlyRepay;
+    @ApiModelProperty("利息总额")
+    private String interest;
+    @ApiModelProperty("预计首期还款日")
+    private String returnTime;
+
+    /***************************金融方案应收明细*******************************/
+    @ApiModelProperty("融资首付")
+    private String downPayAmounts;
+    @ApiModelProperty("实际首付比例")
+    private String downPayAmountsRatio;
+    @ApiModelProperty("贷款保证金")
+    private String bondAmounts;
+    @ApiModelProperty("保险保证金")
+    private String depositPremium;
+    @ApiModelProperty("落户保证金")
+    private String depositSettle;
+    @ApiModelProperty("服务费")
+    private String serviceAmount;
+    @ApiModelProperty("代收意外险")
+    private String proxyAccidentPremium;
+    @ApiModelProperty("上牌费")
+    private String registerAmount;
+    @ApiModelProperty("运管费")
+    private String operationAmount;
+    @ApiModelProperty("补车价")
+    private String vehOtherPrice;
+    @ApiModelProperty("其它费用")
+    private String otherAmount;
+    @ApiModelProperty("其它费用说明")
+    private String otherAmountRemark;
+    @ApiModelProperty("办理方式选择")
+    private String dealWay;
+    @ApiModelProperty("办理方式选择key")
+    private String dealWayKey;
+    @ApiModelProperty("代收合计")
+    private String proxyTotal;
+    @ApiModelProperty("代收首年保险费")
+    private String proxyPremium;
+    @ApiModelProperty("代收购置费")
+    private String proxyPurchasetax;
+    @ApiModelProperty("抵顶首年保险费")
+    private String offsetPremium;
+    @ApiModelProperty("抵顶购置税")
+    private String offsetPurchasetax;
+    @ApiModelProperty("抵顶费用合计")
+    private String offsetTotal;
+    @ApiModelProperty("应收合计")
+    private String receivableTotal;
+    @ApiModelProperty("实收合计")
+    private String realTotal;
+    @ApiModelProperty("车辆总价")
+    private String vehTotalPrice;
+    @ApiModelProperty("名义留购价")
+    private String nominalPrice;
+
+    @ApiModelProperty("单台成交价")
+    private String finalPrice;
+    @ApiModelProperty("挂车价格")
+    private String gcPrice;
+    @ApiModelProperty("上装成交价")
+    private String szPrice;
+
+
+    @ApiModelProperty("拼接的List")
+    private List<BaseSolutionListVo> financeForms = new ArrayList<>();
+
+
+    private String serviceChargeTypeKey;
+    private String serviceChargeTypeValue;
+
+    private String modelSid;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseQuotationVo.java

@@ -51,106 +51,5 @@ public class BaseQuotationVo implements Vo {
     @ApiModelProperty("备注")
     private String remarks;
 
-    @ApiModelProperty("是否打包")
+    private BaseJRFAVo baseJRFAVo;
-    private String isPack;
-    @ApiModelProperty("产品政策")
-    private String policyName;
-    @ApiModelProperty("融资项目")
-    private String financProject;
-    @ApiModelProperty("融资项目总额")
-    private String loanTotal;
-    @ApiModelProperty("首付比例")
-    private String downPayRatio;
-    @ApiModelProperty("首付金额")
-    private String downPayAmount;
-    @ApiModelProperty("产品贷款金额")
-    private String loanAmount;
-    @ApiModelProperty("产品期数")
-    private String loanPeriod;
-    @ApiModelProperty("贷款保证金比例")
-    private String bondRatio;
-    @ApiModelProperty("贷款保证金")
-    private String bondAmount;
-    @ApiModelProperty("厂家贴息")
-    private String factoryDiscount;
-    @ApiModelProperty("贴息用途")
-    private String factoryDiscountUse;
-    @ApiModelProperty("年利率（%）")
-    private String policyYearRatio;
-    @ApiModelProperty("月还金额")
-    private String loanPayMoney;
-    @ApiModelProperty("利息总额")
-    private String loanInterest;
-    @ApiModelProperty("贴息抵车款")
-    private String discountCar;
-    @ApiModelProperty("其它融名称")
-    private String otherPolicyName;
-    @ApiModelProperty("贷款金额")
-    private String loanAmountTotal;
-    @ApiModelProperty("期数")
-    private String period;
-    @ApiModelProperty("年利率（%）")
-    private String otherPolicyYearRatio;
-    @ApiModelProperty("月还金额")
-    private String monthlyRepay;
-    @ApiModelProperty("利息总额")
-    private String interest;
-    @ApiModelProperty("融资首付")
-    private String loanDownPay;
-    @ApiModelProperty("实际首付比例")
-    private String downPayAmountsRatio;
-    @ApiModelProperty("总贷款金额")
-    private String hzLoanAmountTotal;
-    @ApiModelProperty("期数")
-    private String hzPeriod;
-    @ApiModelProperty("月还金额")
-    private String hzMonthlyRepay;
-    @ApiModelProperty("利息总额")
-    private String hzInterest;
-    @ApiModelProperty("预计首期还款日")
-    private String returnTime;
-    @ApiModelProperty("融资首付")
-    private String mxLoanDownPay;
-    @ApiModelProperty("贷款保证金")
-    private String mxBondAmount;
-    @ApiModelProperty("保险保证金")
-    private String depositPremium;
-    @ApiModelProperty("落户保证金")
-    private String depositSettle;
-    @ApiModelProperty("服务费")
-    private String serviceAmount;
-    @ApiModelProperty("代收意外险")
-    private String proxyAccidentPremium;
-    @ApiModelProperty("上牌费")
-    private String licenseFfe;
-    @ApiModelProperty("运管费")
-    private String operationAmount;
-    @ApiModelProperty("补车价")
-    private String vehOtherPrice;
-    @ApiModelProperty("其它费用")
-    private String otherAmount;
-    @ApiModelProperty("其它费用说明")
-    private String otherAmountRemark;
-    @ApiModelProperty("办理方式选择")
-    private String dealWay;
-    @ApiModelProperty("代收费用合计")
-    private String proxyTotal;
-    @ApiModelProperty("代收首年保险费")
-    private String proxyPremium;
-    @ApiModelProperty("代收购置税")
-    private String proxyPurchasetax;
-    @ApiModelProperty("应收合计")
-    private String receivableTotal;
-    @ApiModelProperty("抵顶费用合计")
-    private String offsetTotal;
-    @ApiModelProperty("抵顶首年保险费")
-    private String offsetPremium;
-    @ApiModelProperty("抵顶购置税")
-    private String offsetPurchasetax;
-    @ApiModelProperty("实收合计")
-    private String realTotal;
-    @ApiModelProperty("车辆总价")
-    private String vehTotalPrice;
-    @ApiModelProperty("名义(留购)价")
-    private String nominalPrice;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseSolutionListVo.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.base.api.basevehicleout;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/15
+ **/
+@Data
+public class BaseSolutionListVo implements Vo {
+    private static final long serialVersionUID = -8839895532609865401L;
+
+    @ApiModelProperty(value = "内容")
+    private String value;
+
+    @ApiModelProperty(value = "单元格大小")
+    private Integer spanSize;
+
+    @ApiModelProperty("类型:0 最普通的 1 标题的  2是 加上划线的")
+    private Integer type;
+    @ApiModelProperty("是否加粗，true是，false否")
+    private boolean bold;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java

@@ -102,6 +102,11 @@ public interface BaseVehicleOutFeign {
     @PostMapping("/selectQuotation")
     @ResponseBody
     public ResultBean<BaseQuotationVo> selectQuotation(@RequestParam("sid") String sid);
+
+    @ApiOperation(("打印交接单"))
+    @PostMapping("/createjrbjdPdf")
+    @ResponseBody
+    public ResultBean<PdfPath> createjrbjdPdf(@RequestParam("sid") String sid);
 }
 
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java

@@ -139,4 +139,11 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
     public ResultBean<BaseQuotationVo> selectQuotation(String sid) {
         return baseVehicleOutService.selectQuotation(sid);
     }
+
+    @Override
+    public ResultBean<PdfPath> createjrbjdPdf(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        PdfPath pdf = baseVehicleOutService.createjrbjdPdf(sid);
+        return rb.success().setData(pdf);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -35,6 +35,8 @@ import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyDetailQuery;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyDetailVo;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyFeign;
+import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetails;
+import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderSourceLCVo;
@@ -68,6 +70,8 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo;
+import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.*;
 import com.yxt.common.core.query.PagerQuery;
@@ -79,6 +83,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.File;
 import java.math.BigDecimal;
 import java.util.*;
 
@@ -128,6 +133,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     @Autowired
     private BusDeliveredApplyFeign busDeliveredApplyFeign;
     @Autowired
+    private BusDeliveredApplyDetailsFeign busDeliveredApplyDetailsFeign;
+    @Autowired
     private LoanSolutionsFeign loanSolutionsFeign;
     @Autowired
     private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
@@ -141,6 +148,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     private BusSalesOrderModelFeign busSalesOrderModelFeign;
     @Autowired
     private BusSalesOrderMakeupFeign busSalesOrderMakeupFeign;
+    @Autowired
+    private DocPdfComponent docPdfComponent;
 
     public ResultBean<Boolean> vehicleOut(BaseVehicleOutDto dto) {
         log.info("BaseVehicleOutService-vehicleOut-95:{}", JSONObject.toJSONString(dto));
@@ -1654,7 +1663,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                                 gcOrSzDtosDK.add(gcOrSzDto);
                             }
                         }
-                        if (gcOrSzDtosDK.size() > 0){
+                        if (gcOrSzDtosDK.size() > 0) {
                             SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtosDK, baseVehicleOutApply, temporaryNumGcOrSz);
                             finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
                             j = j + 1;
@@ -2268,14 +2277,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     public ResultBean<BaseQuotationVo> selectQuotation(String sid) {
         ResultBean rb = ResultBean.fireFail();
         BaseQuotationVo baseQuotationVo = new BaseQuotationVo();
-        //查询出库子表
+        //查询出库申请
-        BaseVehicleOut baseVehicleOut = fetchBySid(sid);
+        BusDeliveredApply busDeliveredApply = busDeliveredApplyFeign.fetchBySid(sid).getData();
-        //查询出库主表
+        //查询出库申请车辆表
-        BaseVehicleOutApply baseVehicleOutApply = baseVehicleOutApplyService.fetchBySid(baseVehicleOut.getMainSid());
+        List<BusDeliveredApplyDetails> busDeliveredApplyDetails = busDeliveredApplyDetailsFeign.selectByApplySid(busDeliveredApply.getSid()).getData();
         //根据合同号和车辆sid查询销售订单车辆信息
-        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(baseVehicleOutApply.getContractNo(), baseVehicleOut.getVinSid()).getData();
+        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(busDeliveredApply.getContractNo(), busDeliveredApplyDetails.get(0).getVinSid()).getData();
         //查询销售订单信息
-        BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(busSalesOrderVehicle.getSalesOrderSid()).getData();
+        BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
         //销售部门
         baseQuotationVo.setSaleDeptName(busSalesOrder.getOrgName());
         //销售人员
@@ -2287,7 +2296,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         //贷款人姓名
         baseQuotationVo.setLoanBorrName(busSalesOrderLoancontractDetailsVo.getBorrowerName());
         //车架号
-        baseQuotationVo.setVinNo(baseVehicleOut.getVinNo());
+        baseQuotationVo.setVinNo(busDeliveredApplyDetails.get(0).getVinNo());
         //查询贷款人信息
         BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderLoancontractDetailsVo.getBorrowerSid()).getData();
         //电话
@@ -2303,13 +2312,13 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         //车型
         baseQuotationVo.setModelName(busSalesOrderModel.getModelName());
         //查询挂车信息
-        List<BaseTrailerVo> baseTrailerVos = baseTrailerService.fetchAllByVehSid(baseVehicleOut.getVinSid());
+        List<BaseTrailerVo> baseTrailerVos = baseTrailerService.fetchAllByVehSid(busDeliveredApplyDetails.get(0).getVinSid());
-        if (baseTrailerVos.size() == 1){
+        if (baseTrailerVos.size() == 1) {
             BaseTrailerVo baseTrailerVo = baseTrailerVos.get(0);
             //挂车车型
             baseQuotationVo.setGcOneModel(baseTrailerVo.getTrailerModel());
             //采购单位 TODO
-        }else if (baseTrailerVos.size() > 1){
+        } else if (baseTrailerVos.size() > 1) {
             BaseTrailerVo baseTrailerVo1 = baseTrailerVos.get(0);
             //挂车车型
             baseQuotationVo.setGcOneModel(baseTrailerVo1.getTrailerModel());
@@ -2320,16 +2329,178 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             //采购单位 TODO
         }
         //查询上装信息
-        BaseVehinstallDetailsVo baseVehinstallDetailsVo = baseVehinstallService.fetchByVinNoAndOrgSid(baseVehicleOut.getVinNo(), baseVehicleOutApply.getCreateOrgSid());
+        BaseVehinstallDetailsVo baseVehinstallDetailsVo = baseVehinstallService.fetchByVinNoAndOrgSid(busDeliveredApplyDetails.get(0).getVinNo(), busDeliveredApply.getUseOrgSid());
-        if (baseVehinstallDetailsVo != null){
+        if (baseVehinstallDetailsVo != null) {
             BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupFeign.selectTop(baseVehinstallDetailsVo.getSid(), busSalesOrder.getSid()).getData();
-            if (busSalesOrderMakeup != null){
+            if (busSalesOrderMakeup != null) {
                 //上装名称
                 baseQuotationVo.setSzOneName(busSalesOrderMakeup.getTopName());
                 //上装采购单位
                 baseQuotationVo.setSzOnePurUnit(busSalesOrderMakeup.getRefitFactory());
             }
         }
-        return null;
+        //备注
+        baseQuotationVo.setRemarks(busSalesOrder.getRemarks());
+        //查询金融方案
+        SolutionssVo solutionssVo = loanSolutionsFeign.selectDetails2(busSalesOrder.getSid()).getData();
+        //金融方案复制
+        BaseJRFAVo baseJRFAVo = new BaseJRFAVo();
+        BeanUtil.copyProperties(solutionssVo, baseJRFAVo);
+        //融资项目
+        String financProject = "";
+        if (StringUtils.isNotBlank(solutionssVo.getMainVehicleAmount())) {
+            financProject = financProject + "主车发票价" + solutionssVo.getMainVehicleAmount() + "元" + " ";
+        }
+        if (solutionssVo.isAccessoriesAmountCb()) {
+            financProject = financProject + "配件" + solutionssVo.getAccessoriesAmount() + "元" + " ";
+        }
+        if (solutionssVo.isTrailerAmountCb()) {
+            financProject = financProject + "挂车" + solutionssVo.getTrailerAmount() + "元" + " ";
+        }
+        if (solutionssVo.isPremiumCb()) {
+            financProject = financProject + "保险" + solutionssVo.getPremium() + "元" + " ";
+        }
+        if (solutionssVo.isPurchaseTaxCb()) {
+            financProject = financProject + "购置税" + solutionssVo.getPurchaseTax() + "元" + " ";
+        }
+        baseJRFAVo.setFinancProject(financProject);
+        baseQuotationVo.setBaseJRFAVo(baseJRFAVo);
+        return rb.success().setData(baseQuotationVo);
+    }
+
+    public PdfPath createjrbjdPdf(String sid) {
+        BaseQuotationVo baseQuotationVo = selectQuotation(sid).getData();
+        BaseJRFAVo baseJRFAVo = baseQuotationVo.getBaseJRFAVo();
+        PdfPath pdfPath = new PdfPath();
+        //查询出库申请
+        BusDeliveredApply busDeliveredApply = busDeliveredApplyFeign.fetchBySid(sid).getData();
+        //查询出库申请车辆表
+        List<BusDeliveredApplyDetails> busDeliveredApplyDetails = busDeliveredApplyDetailsFeign.selectByApplySid(busDeliveredApply.getSid()).getData();
+        //销售订单
+        BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(busDeliveredApply.getContractNo()).getData();
+        List<File> filesList = new ArrayList<>();
+        for (int i = 0; i < busDeliveredApplyDetails.size(); i++) {
+            Map<String, Object> dataMap = new HashMap<>();
+            dataMap.put("saleDeptName", baseQuotationVo.getSaleDeptName());
+            dataMap.put("staffName", baseQuotationVo.getStaffName());
+            dataMap.put("loanContractNo", baseQuotationVo.getLoanContractNo());
+            //客户信息
+            dataMap.put("loanBorrName", baseQuotationVo.getLoanBorrName());
+            dataMap.put("vinNo", busDeliveredApplyDetails.get(i).getVinNo());
+            dataMap.put("mobile", baseQuotationVo.getMobile());
+            dataMap.put("address", baseQuotationVo.getAddress());
+            dataMap.put("affiliatedCompany", baseQuotationVo.getAffiliatedCompany());
+            //车型及价格
+            dataMap.put("modelName", baseQuotationVo.getModelName());
+            //查询挂车信息
+            List<BaseTrailerVo> baseTrailerVos = baseTrailerService.fetchAllByVehSid(busDeliveredApplyDetails.get(i).getVinSid());
+            if (baseTrailerVos.size() == 1) {
+                BaseTrailerVo baseTrailerVo = baseTrailerVos.get(0);
+                dataMap.put("gcOneModel", baseTrailerVo.getTrailerModel());
+                dataMap.put("gcOnePurUnit", "");
+            } else if (baseTrailerVos.size() > 1) {
+                BaseTrailerVo baseTrailerVo1 = baseTrailerVos.get(0);
+                dataMap.put("gcOneModel", baseTrailerVo1.getTrailerModel());
+                dataMap.put("gcOnePurUnit", "");
+
+                BaseTrailerVo baseTrailerVo2 = baseTrailerVos.get(1);
+                dataMap.put("gcTwoModel", baseTrailerVo2.getTrailerModel());
+                dataMap.put("gcTwoPurUnit", "");
+            }
+            //查询上装信息
+            BaseVehinstallDetailsVo baseVehinstallDetailsVo = baseVehinstallService.fetchByVinNoAndOrgSid(busDeliveredApplyDetails.get(0).getVinNo(), busDeliveredApply.getUseOrgSid());
+            if (baseVehinstallDetailsVo != null) {
+                BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupFeign.selectTop(baseVehinstallDetailsVo.getSid(), busSalesOrder.getSid()).getData();
+                if (busSalesOrderMakeup != null) {
+                    dataMap.put("szOneName", busSalesOrderMakeup.getTopName());
+                    dataMap.put("szOnePurUnit", busSalesOrderMakeup.getRefitFactory());
+                }
+            }
+            dataMap.put("szTwoName", "");
+            dataMap.put("szTwoPurUnit", "");
+            dataMap.put("remarks", baseQuotationVo.getRemarks());
+            //金融方案
+            dataMap.put("isPack", baseJRFAVo.getIsPack());
+            dataMap.put("policyName", baseJRFAVo.getPolicyName());
+            dataMap.put("financProject", baseJRFAVo.getFinancProject());
+            dataMap.put("loanTotal", baseJRFAVo.getLoanTotal());
+            dataMap.put("sfbl", baseJRFAVo.getDownPayRatio());
+            dataMap.put("sfje", baseJRFAVo.getDownPayAmount());
+            dataMap.put("cpdkje", baseJRFAVo.getLoanAmount());
+            dataMap.put("cpqs", baseJRFAVo.getLoanPeriod());
+            dataMap.put("dkbzjbl", baseJRFAVo.getBondRatio());
+            dataMap.put("dkbzj", baseJRFAVo.getBondAmount());
+            dataMap.put("cjtx", baseJRFAVo.getFactoryDiscount());
+            dataMap.put("txyt", baseJRFAVo.getFactoryDiscountUse());
+            dataMap.put("nll", baseJRFAVo.getPolicyYearRatio());
+            dataMap.put("yhje", baseJRFAVo.getLoanPayMoney());
+            dataMap.put("lxze", baseJRFAVo.getLoanInterest());
+            dataMap.put("txdck", baseJRFAVo.getDiscountCar());
+            //其他融
+            dataMap.put("otherPolicyState", baseJRFAVo.isOtherPolicyState());
+            dataMap.put("otherPolicyName", baseJRFAVo.getOtherPolicyName());
+            dataMap.put("qtrdkje", baseJRFAVo.getOtherPolicyAmount());
+            dataMap.put("qtrqs", baseJRFAVo.getOtherPolicyPeriod());
+            dataMap.put("qtrnll", baseJRFAVo.getOtherPolicyYearRatio());
+            dataMap.put("qtryhje", baseJRFAVo.getOtherPolicyMonthlyRepay());
+            dataMap.put("otherPolicyInterest", baseJRFAVo.getOtherPolicyInterest());
+            //方案汇总
+            dataMap.put("loanDownPay", baseJRFAVo.getLoanDownPay());
+            dataMap.put("downPayAmountsRatio", baseJRFAVo.getDownPayAmountsRatio());
+            dataMap.put("loanAmountTotal", baseJRFAVo.getLoanAmountTotal());
+            dataMap.put("period", baseJRFAVo.getPeriod());
+            dataMap.put("monthlyRepay", baseJRFAVo.getMonthlyRepay());
+            dataMap.put("interest", baseJRFAVo.getInterest());
+            dataMap.put("returnTime", baseJRFAVo.getReturnTime());
+            //应收明细
+            dataMap.put("downPayAmounts", baseJRFAVo.getDownPayAmounts());
+            dataMap.put("bondAmounts", baseJRFAVo.getBondAmounts());
+            dataMap.put("depositPremium", baseJRFAVo.getDepositPremium());
+            dataMap.put("depositSettle", baseJRFAVo.getDepositSettle());
+            dataMap.put("serviceAmount", baseJRFAVo.getServiceAmount());
+            dataMap.put("proxyAccidentPremium", baseJRFAVo.getProxyAccidentPremium());
+            dataMap.put("registerAmount", baseJRFAVo.getRegisterAmount());
+            dataMap.put("operationAmount", baseJRFAVo.getOperationAmount());
+            dataMap.put("vehOtherPrice", baseJRFAVo.getVehOtherPrice());
+            dataMap.put("otherAmount", baseJRFAVo.getOtherAmount());
+            dataMap.put("otherAmountRemark", baseJRFAVo.getOtherAmountRemark());
+            dataMap.put("dealWay", baseJRFAVo.getDealWay());
+            dataMap.put("proxyTotal", baseJRFAVo.getProxyTotal());
+            dataMap.put("proxyPremium", baseJRFAVo.getProxyPremium());
+            dataMap.put("proxyPurchasetax", baseJRFAVo.getProxyPurchasetax());
+            dataMap.put("receivableTotal", baseJRFAVo.getReceivableTotal());
+            dataMap.put("offsetTotal", baseJRFAVo.getOffsetTotal());
+            dataMap.put("offsetPremium", baseJRFAVo.getOffsetPremium());
+            dataMap.put("offsetPurchasetax", baseJRFAVo.getOffsetPurchasetax());
+            dataMap.put("realTotal", baseJRFAVo.getRealTotal());
+            dataMap.put("vehTotalPrice", baseJRFAVo.getVehTotalPrice());
+            dataMap.put("nominalPrice", baseJRFAVo.getNominalPrice());
+            //获取模板
+            //模板路径
+            String sourcePath = "D:\\anrui\\upload\\template\\";
+            //生成word文件名
+            String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+            long seconds = System.currentTimeMillis();
+            String typeName = dateStr + seconds + ".doc";
+            //生成文件路径
+            String targetPath = sourcePath + dateStr;
+            WordUtils.creatWord(dataMap, "jrbjd", sourcePath, targetPath, typeName);
+            //新生成的word路径
+            String wordPath = targetPath + "\\" + typeName;
+            //生成出门证文件名
+            String pdfName = "金融报价单_" + dateStr + seconds + ".pdf";
+            WordUtils.doc2pdf(wordPath, targetPath, pdfName, "");
+            File file = new File(docPdfComponent.getUploadTemplateUrl() + dateStr + "/" + pdfName);
+            filesList.add(file);
+        }
+        String typeName = "金融报价单_" + busDeliveredApply.getContractNo() + ".pdf";
+        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+        try {
+            File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + dateStr + "/" + typeName);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        pdfPath.setPdfPath("/template/" + dateStr + "/" + typeName);
+        return pdfPath;
     }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java

@@ -130,6 +130,11 @@ public interface BusDeliveredApplyFeign {
     @ResponseBody
     public ResultBean<BusDeliveredApplyDetailVo> fetchDetailsBySid(@RequestBody BusDeliveredApplyDetailQuery query);
 
+    @ApiOperation("查询一条")
+    @PostMapping("/fetchBySid")
+    @ResponseBody
+    ResultBean<BusDeliveredApply> fetchBySid(@RequestParam("sid") String sid);
+
  /*   @ApiOperation("验证是否可出库")
     @PostMapping("/checkingApply")
 //    @ResponseBody
@@ -226,4 +231,5 @@ public interface BusDeliveredApplyFeign {
     @ResponseBody
     ResultBean<DeliveredFinVo> deliveredFinSelectByBusVinSid(@RequestParam("contractNo") String contractNo, @RequestParam("vinSid") String vinSid);
 
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java

@@ -86,6 +86,11 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign {
         return rb.setMsg("接口anrui-buscenter/busdeliveredapply/fetchDetailsBySid无法访问");
     }
 
+    @Override
+    public ResultBean<BusDeliveredApply> fetchBySid(String sid) {
+        return null;
+    }
+
    /* @Override
     public ResultBean checkingApply(CheckingApplyQuery query) {
         return null;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeign.java

@@ -80,4 +80,9 @@ public interface BusDeliveredApplyDetailsFeign {
     @GetMapping("/getRetrievalCarVin")
     @ResponseBody
     public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(@RequestParam("sid") String sid);
+
+    @ApiOperation("查询多条")
+    @PostMapping("/selectByApplySid")
+    @ResponseBody
+    ResultBean<List<BusDeliveredApplyDetails>> selectByApplySid(@RequestParam("sid") String sid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeignFallback.java

@@ -69,4 +69,9 @@ public class BusDeliveredApplyDetailsFeignFallback implements BusDeliveredApplyD
     public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<BusDeliveredApplyDetails>> selectByApplySid(String sid) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -371,4 +371,9 @@ public interface BusSalesOrderFeign {
     @PostMapping("/saleOrderInputLenderOwn/{saleOrderSid}")
     @ResponseBody
     ResultBean saleOrderInputLenderOwn(@PathVariable("saleOrderSid") String saleOrderSid);
+
+    @ApiOperation("保存销售订单贷款人")
+    @PostMapping("/saveSaleOrderInputLender/{saleOrderSid}/{sid}")
+    @ResponseBody
+    ResultBean<SalesLenderVo> saveSaleOrderInputLender(@PathVariable("saleOrderSid") String saleOrderSid, @PathVariable("sid") String sid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -346,4 +346,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
         return null;
     }
+
+    @Override
+    public ResultBean<SalesLenderVo> saveSaleOrderInputLender(String saleOrderSid, String sid) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java

@@ -81,7 +81,7 @@ public interface BusSalesOrderBorrowerFeign {
     @ResponseBody
     ResultBean updateBusNo(@RequestParam("busNo") String busNo, @RequestParam("saleOrderBorrowerSid") String saleOrderBorrowerSid);
 
-    @ApiOperation("点击贷款人确认时弹出的数量")
+/*    @ApiOperation("点击贷款人确认时弹出的数量")
     @GetMapping("/getOrderNum")
     @ResponseBody
     ResultBean<OrderNumVo> getOrderNum(@RequestParam("sid") String sid);
@@ -89,7 +89,7 @@ public interface BusSalesOrderBorrowerFeign {
     @ApiOperation("确认数量")
     @PostMapping("/confirmBorrow")
     @ResponseBody
-    ResultBean confirmBorrow(@RequestBody OrderBorrowQuery query);
+    ResultBean confirmBorrow(@RequestBody OrderBorrowQuery query);*/
 
     @ApiOperation("公司非担保业务进度维护")
     @PostMapping("/noGuaranteeCreditReviewPage")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java

@@ -75,7 +75,7 @@ public class BusSalesOrderBorrowerFeignFallback implements BusSalesOrderBorrower
 		return null;
 	}
 
-	@Override
+/*	@Override
 	public ResultBean<OrderNumVo> getOrderNum(String sid) {
 		return null;
 	}
@@ -83,7 +83,7 @@ public class BusSalesOrderBorrowerFeignFallback implements BusSalesOrderBorrower
 	@Override
 	public ResultBean confirmBorrow(OrderBorrowQuery query) {
 		return null;
-	}
+	}*/
 
 	@Override
 	public ResultBean<PagerVo<BusNoGuaranteeCreditReviewVo>> noGuaranteeCreditReviewPage(PagerQuery<BusNoGuaranteeCreditReviewQuery> pq) {

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

@@ -59,7 +59,7 @@ public class BusSalesOrderLoancontract extends BaseEntity {
 	@ApiModelProperty("台数")
     private Integer vehCount; // 台数
 	@ApiModelProperty("消贷合同编号")
-    private String loanCotractNo; // 消贷合同编号
+    private String loanContractNo; // 消贷合同编号
 	@ApiModelProperty("资方合同号")
     private String bankContractNo; // 资方合同号
     @ApiModelProperty("资方名称")

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java

@@ -146,6 +146,13 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
         return vo;
     }
 
+    @Override
+    public ResultBean<BusDeliveredApply> fetchBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusDeliveredApply busDeliveredApply = busDeliveredApplyService.fetchBySid(sid);
+        return rb.success().setData(busDeliveredApply);
+    }
+
    /* @Override
     public ResultBean checkingApply(CheckingApplyQuery query) {
         return busDeliveredApplyService.checkingApply(query);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsRest.java

@@ -90,4 +90,11 @@ public class BusDeliveredApplyDetailsRest implements BusDeliveredApplyDetailsFei
         List<AppCarVinListVo> list = busDeliveredApplyDetailsService.getRetrievalCarVin(sid);
         return rb.success().setData(list);
     }
+
+    @Override
+    public ResultBean<List<BusDeliveredApplyDetails>> selectByApplySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BusDeliveredApplyDetails> busDeliveredApplyDetails = busDeliveredApplyDetailsService.selectByApplySid(sid);
+        return rb.success().setData(busDeliveredApplyDetails);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@@ -35,6 +35,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
@@ -220,4 +221,5 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
     BusSalesOrder selectByContractNos(String contractNo);
 
     String selectBySid(String sid);
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -57,7 +57,6 @@
         when 0 then '否'
         when 1 then '是' end as insuranceInfo,
         if(bo.nodeState = '已办结', true, false) as showStopBtn,
-        if(bo.nodeState = '已办结', true, false) as showBorrowBtn,
         bo.nodeState is null as showUpdateBtn,
         bo.nodeState is null as showDeleteBtn,
         0 as showFinancialBtn,

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java

@@ -429,4 +429,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
         return busSalesOrderService.saleOrderInputLenderOwn(saleOrderSid);
     }
+
+    @Override
+    public ResultBean<SalesLenderVo> saveSaleOrderInputLender(String saleOrderSid, String sid) {
+        return busSalesOrderService.saveSaleOrderInputLender(saleOrderSid,sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -160,6 +160,12 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.portal.config.DictCommonType;
+import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply;
+import com.yxt.anrui.riskcenter.api.loanhomevisitprep.HomeVisitDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepFeign;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsVo;
@@ -335,6 +341,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private BaseVehicleStateFeign baseVehicleStateFeign;
     @Autowired
     private BusSalesOrderBorrowerService busSalesOrderBorrowerService;
+    @Autowired
+    private LoanHomevisitPrepFeign loanHomevisitPrepFeign;
 
     /**
      * 构造查询条件
@@ -2104,15 +2112,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 record.setShowContractBtn(false);
             }
             //ToDo:需考虑家访准备是否存在该贷款人，若存在，则不允许修改贷款人，即确定贷款人按钮不显示。
-            if (record.isShowBorrowBtn()) {
+            if ("已办结".equals(record.getSaleOrderState()) && "2".equals(record.getCarPurchaseKey())) {
-                //为现车类型且不确定车架号的，
+                /*//为现车类型且不确定车架号的，
                 if ("1".equals(record.getType())) {
                     if (StringUtils.isNotBlank(record.getNowCarUnknownVinNum()) && !"0".equals(record.getNowCarUnknownVinNum())) {
                         record.setShowBorrowBtn(true);
                     } else {
                         record.setShowBorrowBtn(false);
                     }
-                }
+                }else{
+
+                }*/
+                record.setShowBorrowBtn(true);
             }
 
 
@@ -7421,6 +7432,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (busSalesOrderBorrower == null) {
             return rb.setMsg("该贷款人不存在");
         }
+        BusSalesOrder busSalesOrder = fetchBySid(busSalesOrderBorrower.getSalesOrderSid());
         //查询该销售订单已确定的数量
         int count = busSalesOrderBorrowerService.selectByNum(busSalesOrderBorrower.getSalesOrderSid());
         BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrderBorrower.getSalesOrderSid());
@@ -7431,7 +7443,22 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
         }
         busSalesOrderBorrower.setVehCount(Integer.parseInt(num));
-        busSalesOrderBorrowerService.updateById(busSalesOrderBorrower);
+        List<BusSalesOrderVehicle> list = busSalesOrderPriceService.selectByOrdersSid(busSalesOrderBorrower.getSalesOrderSid());
+        list.removeAll(Collections.singleton(null));
+        if(list.size()>0){
+            for (int i = 0; i < Integer.parseInt(num); i++) {
+                BusSalesOrderVehicle busSalesOrderVehicle = list.get(i);
+                busSalesOrderVehicle.setBorrowerSid(busSalesOrderBorrower.getSid());
+                busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
+            }
+            busSalesOrderBorrowerService.updateById(busSalesOrderBorrower);
+            HomeVisitDto homeVisitDto = new HomeVisitDto();
+            homeVisitDto.setSaleOrderSid(busSalesOrderBorrower.getSalesOrderSid());
+            homeVisitDto.setSaleOrderBorrowerSid(sid);
+            loanHomevisitPrepFeign.saveHomeVisit(homeVisitDto);
+        }else{
+            return rb.setMsg("该销售订单的剩余台数已不足");
+        }
         return rb.success();
     }
 
@@ -7451,4 +7478,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         busSalesOrderBorrowerService.insert(busSalesOrderBorrower);
         return rb.success();
     }
+
+    public ResultBean<SalesLenderVo> saveSaleOrderInputLender(String saleOrderSid, String sid) {
+        ResultBean resultBean = busSalesOrderBorrowerService.confirmBorrow(saleOrderSid, sid);
+        ResultBean<SalesLenderVo> lenderVoResultBean = saleOrderInputLender(saleOrderSid);
+        return lenderVoResultBean;
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java

@@ -34,6 +34,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.LenderVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusNoGuaranteeCreditReviewVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -91,4 +92,6 @@ public interface BusSalesOrderBorrowerMapper extends BaseMapper<BusSalesOrderBor
     int selectByNum(String salesOrderSid);
 
     BusSalesOrderBorrower selectByOrderSids(String saleOrderSid);
+
+    LoanPreloanCreditApply selectByCr(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml

@@ -75,4 +75,8 @@
             bus_sales_order bo on bo.sid = bb.salesOrderSid
         where bo.customerSid = bb.customSid and bo.sid = #{saleOrderSid}
     </select>
+
+    <select id="selectByCr" resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply">
+        select * from anrui_riskcenter.loan_preloan_credit_apply where sid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java

@@ -98,7 +98,7 @@ public class BusSalesOrderBorrowerRest implements BusSalesOrderBorrowerFeign {
         return busSalesOrderBorrowerService.updateBusNo(busNo, saleOrderBorrowerSid);
     }
 
-    @Override
+  /*  @Override
     public ResultBean<OrderNumVo> getOrderNum(String sid) {
         return busSalesOrderBorrowerService.getOrderNum(sid);
     }
@@ -106,7 +106,7 @@ public class BusSalesOrderBorrowerRest implements BusSalesOrderBorrowerFeign {
     @Override
     public ResultBean confirmBorrow(OrderBorrowQuery query) {
         return busSalesOrderBorrowerService.confirmBorrow(query);
-    }
+    }*/
 
     @Override
     public ResultBean<PagerVo<BusNoGuaranteeCreditReviewVo>> noGuaranteeCreditReviewPage(PagerQuery<BusNoGuaranteeCreditReviewQuery> pq) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java

@@ -37,10 +37,12 @@ import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
 import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -132,7 +134,7 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
         return rb.success();
     }
 
-    public ResultBean<OrderNumVo> getOrderNum(String sid) {
+  /*  public ResultBean<OrderNumVo> getOrderNum(String sid) {
         ResultBean<OrderNumVo> rb = ResultBean.fireFail();
         OrderNumVo orderNumVo = new OrderNumVo();
         BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(sid);
@@ -145,40 +147,28 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
         int yuNum = busSalesOrderPrice.getQuantity() - num;
         orderNumVo.setOrderYuNum(String.valueOf(yuNum));
         return rb.success().setData(orderNumVo);
-    }
+    }*/
 
-    public ResultBean confirmBorrow(OrderBorrowQuery query) {
+//    public ResultBean confirmBorrow(OrderBorrowQuery query) {
+    public ResultBean confirmBorrow(String saleOrderSid,String sid) {
         ResultBean rb = ResultBean.fireFail();
+        LoanPreloanCreditApply loanPreloanCreditApply = baseMapper.selectByCr(sid);
         //销售订单sid
-        String sid = query.getSid();
+        BusSalesOrderBorrower busSalesOrderBorrower = baseMapper.selectByOrderSid(saleOrderSid, loanPreloanCreditApply.getCustSid());
-        String customerSid = query.getCustomSid();
-        BusSalesOrderBorrower busSalesOrderBorrower = baseMapper.selectByOrderSid(sid, customerSid);
         if (busSalesOrderBorrower != null) {
             return rb.setMsg("该销售订单中已存在该贷款人");
         }
         busSalesOrderBorrower = new BusSalesOrderBorrower();
-        busSalesOrderBorrower.setSalesOrderSid(sid);
+        busSalesOrderBorrower.setSalesOrderSid(saleOrderSid);
-        busSalesOrderBorrower.setBorrowerName(query.getBorrowerName());
+        busSalesOrderBorrower.setBorrowerName(loanPreloanCreditApply.getCustName());
-        busSalesOrderBorrower.setCustomSid(query.getCustomSid());
+        busSalesOrderBorrower.setCustomSid(loanPreloanCreditApply.getCustSid());
-        busSalesOrderBorrower.setMobile(query.getMobile());
+        busSalesOrderBorrower.setMobile(loanPreloanCreditApply.getPhone());
-        busSalesOrderBorrower.setVehCount(query.getVehCount());
+        LoanFinPolicy loanFinPolicy = baseMapper.selectBySid(saleOrderSid);
-        LoanFinPolicy loanFinPolicy = baseMapper.selectBySid(sid);
         if (loanFinPolicy != null) {
             busSalesOrderBorrower.setBankSid(loanFinPolicy.getBankSid());
             busSalesOrderBorrower.setBankName(loanFinPolicy.getBankShortName());
             busSalesOrderBorrower.setPolicyName(loanFinPolicy.getPolicyName());
         }
-        //更新销售订单车辆里的贷款人
-        List<BusSalesOrderVehicle> list = busSalesOrderPriceService.selectByOrdersSid(sid);
-        list.removeAll(Collections.singleton(null));
-        if (list.size() < query.getVehCount()) {
-            return rb.setMsg("销售订单剩余台数不足");
-        }
-        for (int i = 0; i < query.getVehCount(); i++) {
-            BusSalesOrderVehicle busSalesOrderVehicle = list.get(i);
-            busSalesOrderVehicle.setBorrowerSid(query.getCustomSid());
-            busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
-        }
         baseMapper.insert(busSalesOrderBorrower);
         return rb.success();
     }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmSolutions.java

@@ -165,4 +165,6 @@ public class AppCrmSolutions {
 
     private String serviceChargeTypeKey;
     private String serviceChargeTypeValue;
+
+    private String modelSid;
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java

@@ -54,4 +54,5 @@ public class AppCrmVehicledemandDetailsVo implements Vo {
     private AppCrmSolutions finNormal;
 
 
+
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java

@@ -371,7 +371,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                     List<CrmSolutionListVo> voList = Optional.ofNullable(financeForms).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), CrmSolutionListVo.class)).collect(Collectors.toList());
                     finNormal.setFinanceForms(voList);
                 }
+                finNormal.setModelSid(appCrmVehicledemandDetailsVo.getModelSid());
                 appCrmVehicledemandDetailsVo.setFinNormal(finNormal);
+
             }
         }
         return rb.success().setData(appCrmVehicledemandDetailsVo);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamine.java

@@ -51,12 +51,17 @@ public class LoanFileexamine extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
 	@ApiModelProperty("销售订单sid")
-    private String saleOrderSid; // 销售订单sid
+    private String saleOrderSid;
 	@ApiModelProperty("销售订单消贷合同sid")
-    private String loanContractSid; // 销售订单消贷合同sid
+    private String loanContractSid;
-	@ApiModelProperty("资方状态")
+    @ApiModelProperty("资方状态key")
-    private String bankState; // 资方状态
+    private String bankStateKey;
-	@ApiModelProperty("资料状态")
+	@ApiModelProperty("资方状态value")
-    private String fileState; // 资料状态
+    private String bankStateValue;
-
+	@ApiModelProperty("电子件状态")
+    private String dzjState;
+    @ApiModelProperty("原件状态")
+    private String yjState;
+    @ApiModelProperty("资料状态")
+    private String zlState;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDetailsVo.java

@@ -73,8 +73,12 @@ public class LoanFileexamineDetailsVo implements Vo {
     private List<String> bdImages;
     @ApiModelProperty("融资合同")
     private List<String> rzhtImages;
-    @ApiModelProperty("资方状态")
+    @ApiModelProperty("资方状态key")
-    private String bankState;
+    private String bankStateKey;
+    @ApiModelProperty("资方状态value")
+    private String bankStateValue;
+    @ApiModelProperty("资料状态")
+    private String zlState;
     @ApiModelProperty("证明附件")
     private List<String> zmfjImages;
     @ApiModelProperty("备注")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDto.java

@@ -32,6 +32,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Project: anrui-riskcenter(放款资料审核) <br/>
  * File: LoanFileexamineDto.java <br/>
@@ -52,12 +55,27 @@ public class LoanFileexamineDto implements Dto {
     private String sid; // sid
 
 	@ApiModelProperty("销售订单sid")
-    private String saleOrderSid; // 销售订单sid
+    private String saleOrderSid;
 	@ApiModelProperty("销售订单消贷合同sid")
-    private String loanContractSid; // 销售订单消贷合同sid
+    private String loanContractSid;
-	@ApiModelProperty("资方状态")
+    @ApiModelProperty("资方状态key")
-    private String bankState; // 资方状态
+    private String bankStateKey;
-	@ApiModelProperty("资料状态")
+    @ApiModelProperty("资方状态value")
-    private String fileState; // 资料状态
+    private String bankStateValue;
-
+    @ApiModelProperty("资料状态")
+    private String zlState;
+    @ApiModelProperty("银行卡")
+    private List<String> yhkImages = new ArrayList<>();
+    @ApiModelProperty("购置税发票")
+    private List<String> gzsfpImages = new ArrayList<>();
+    @ApiModelProperty("保险发票")
+    private List<String> bxfpImages = new ArrayList<>();
+    @ApiModelProperty("保单")
+    private List<String> bdImages = new ArrayList<>();
+    @ApiModelProperty("融资合同")
+    private List<String> rzhtImages = new ArrayList<>();
+    @ApiModelProperty("证明附件")
+    private List<String> zmfjImages = new ArrayList<>();
+    @ApiModelProperty("备注")
+    private String remarks;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java

@@ -67,10 +67,14 @@ public class LoanFileexamineQuery implements Query {
     private String policyName;
     @ApiModelProperty("资方合同号")
     private String bankContractNo;
-    @ApiModelProperty("资方状态")
+    @ApiModelProperty("资方状态value")
-    private String bankState;
+    private String bankStateValue;
+    @ApiModelProperty("电子件状态")
+    private String dzjState;
+    @ApiModelProperty("原件状态")
+    private String yjState;
     @ApiModelProperty("资料状态")
-    private String fileState;
+    private String zlState;
     @ApiModelProperty("组织全路径")
     private String orgSidPath;
     private String menuUrl;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java

@@ -57,10 +57,14 @@ public class LoanFileexamineVo implements Vo {
     private String orgName;
     @ApiModelProperty("销售专员名称")
     private String staffName;
-    @ApiModelProperty("资方状态")
+    @ApiModelProperty("资方状态value")
-    private String bankState;
+    private String bankStateValue;
+    @ApiModelProperty("电子件状态")
+    private String dzjState;
+    @ApiModelProperty("原件状态")
+    private String yjState;
     @ApiModelProperty("资料状态")
-    private String fileState;
+    private String zlState;
     @ApiModelProperty("消贷合同编号")
     private String loanContractNo;
     @ApiModelProperty("台数")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/HomeVisitDto.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.riskcenter.api.loanhomevisitprep;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/13
+ **/
+@Data
+public class HomeVisitDto implements Dto {
+    private static final long serialVersionUID = -5874422243133205264L;
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty("销售订单贷款人表sid")
+    private String saleOrderBorrowerSid;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java

@@ -90,4 +90,9 @@ public interface LoanHomevisitPrepFeign {
     @PostMapping("/saveLoanCon")
     @ResponseBody
     public ResultBean saveLoanCon(@RequestParam("sid") String sid, @RequestParam("conSetUpKey") String conSetUpKey);
+
+    @ApiOperation("确定贷款人推送家纺准备")
+    @PostMapping("/saveHomeVisit")
+    @ResponseBody
+    ResultBean saveHomeVisit(@RequestBody HomeVisitDto dto);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeignFallback.java

@@ -84,4 +84,9 @@ public class LoanHomevisitPrepFeignFallback implements LoanHomevisitPrepFeign {
 	public ResultBean saveLoanCon(String sid, String conSetUpKey) {
 		return null;
 	}
+
+	@Override
+	public ResultBean saveHomeVisit(HomeVisitDto dto) {
+		return null;
+	}
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.riskcenter.api.loanpreloancreditapply;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -30,5 +31,7 @@ public class LoanPreloanVo implements Vo {
     @ApiModelProperty("申请日期")
     private String createTime;
 
+    private String sid;
+
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssQuery.java

@@ -110,4 +110,6 @@ public class SolutionssQuery implements Query {
     private String offsetPurchasetax;
     @ApiModelProperty("名义留购价")
     private String nominalPrice;
+
+    private String modelSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java

@@ -170,5 +170,7 @@ public class SolutionssVo implements Vo {
     private String serviceChargeTypeKey;
     private String serviceChargeTypeValue;
 
+    private String modelSid;
+
 
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml

@@ -9,8 +9,9 @@
         bo.`useOrgName`,
         bo.`orgName`,
         bo.`staffName`,
-        lf.`bankState`,
+        lf.`bankStateValue`,
-        lf.`fileState`,
+        IF(lf.`dzjState` = '0', '未齐全', '已齐全'),
+        IF(lf.`yjState` = '0', '未齐全', '已齐全'),
         bl.`loanContractNo`,
         bl.`vehCount` AS num,
         bl.`borrowerName`,

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java

@@ -41,8 +41,10 @@ import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileFeign;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.core.result.ResultBean;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -87,6 +89,8 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
 	private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
 	@Autowired
 	private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService;
+	@Autowired
+	private FileUploadComponent fileUploadComponent;
 
 	public PagerVo<LoanFileexamineVo> listPageVo(PagerQuery<LoanFileexamineQuery> pq) {
 		LoanFileexamineQuery query = pq.getParams();
@@ -155,11 +159,14 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
 		if (StringUtils.isNotBlank(query.getBankContractNo())) {
 			qw.like("bl.bankContractNo", query.getBankContractNo());
 		}
-		if (StringUtils.isNotBlank(query.getBankState())) {
+		if (StringUtils.isNotBlank(query.getBankStateValue())) {
-			qw.like("lf.bankState", query.getBankState());
+			qw.like("lf.bankStateValue", query.getBankStateValue());
+		}
+		if (StringUtils.isNotBlank(query.getDzjState())) {
+			qw.eq("lf.dzjState", query.getDzjState());
 		}
-		if (StringUtils.isNotBlank(query.getFileState())) {
+		if (StringUtils.isNotBlank(query.getYjState())) {
-			qw.like("lf.fileState", query.getFileState());
+			qw.eq("lf.yjState", query.getYjState());
 		}
 		IPage<LoanFileexamine> page = PagerUtil.queryToPage(pq);
 		IPage<LoanFileexamineVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -169,17 +176,145 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
 	
 	public void saveOrUpdateDto(LoanFileexamineDto dto){
         String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
+		List<String> yhkImages = dto.getYhkImages();
-            this.insertByDto(dto);
+		List<String> gzsfpImages = dto.getGzsfpImages();
-            return; 
+		List<String> bxfpImages = dto.getBxfpImages();
+		List<String> bdImages = dto.getBdImages();
+		List<String> rzhtImages = dto.getRzhtImages();
+		List<String> zmfjImages = dto.getZmfjImages();
+		if (StringUtils.isBlank(dtoSid)) {
+			String sid = this.insertByDto(dto);
+			for (String yhkImage : yhkImages) {
+				LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+				loanHomevisitInvestigateFileDto.setMainSid(sid);
+				loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType());
+				if (yhkImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+					yhkImage = yhkImage.replace(fileUploadComponent.getUrlPrefix(), "");
+				}
+				loanHomevisitInvestigateFileDto.setFileUrl(yhkImage);
+				loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+			}
+			for (String gzsfpImage : gzsfpImages) {
+				LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+				loanHomevisitInvestigateFileDto.setMainSid(sid);
+				loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.GZSFP.getAttachType());
+				if (gzsfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+					gzsfpImage = gzsfpImage.replace(fileUploadComponent.getUrlPrefix(), "");
+				}
+				loanHomevisitInvestigateFileDto.setFileUrl(gzsfpImage);
+				loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+			}
+			for (String bxfpImage : bxfpImages) {
+				LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+				loanHomevisitInvestigateFileDto.setMainSid(sid);
+				loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BXFP.getAttachType());
+				if (bxfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+					bxfpImage = bxfpImage.replace(fileUploadComponent.getUrlPrefix(), "");
+				}
+				loanHomevisitInvestigateFileDto.setFileUrl(bxfpImage);
+				loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+			}
+			for (String bdImage : bdImages) {
+				LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+				loanHomevisitInvestigateFileDto.setMainSid(sid);
+				loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BD.getAttachType());
+				if (bdImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+					bdImage = bdImage.replace(fileUploadComponent.getUrlPrefix(), "");
+				}
+				loanHomevisitInvestigateFileDto.setFileUrl(bdImage);
+				loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+			}
+			for (String rzhtImage : rzhtImages) {
+				LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+				loanHomevisitInvestigateFileDto.setMainSid(sid);
+				loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.RZHT.getAttachType());
+				if (rzhtImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+					rzhtImage = rzhtImage.replace(fileUploadComponent.getUrlPrefix(), "");
+				}
+				loanHomevisitInvestigateFileDto.setFileUrl(rzhtImage);
+				loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+			}
+			for (String zmfjImage : zmfjImages) {
+				LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+				loanHomevisitInvestigateFileDto.setMainSid(sid);
+				loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.ZMFJ.getAttachType());
+				if (zmfjImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+					zmfjImage = zmfjImage.replace(fileUploadComponent.getUrlPrefix(), "");
+				}
+				loanHomevisitInvestigateFileDto.setFileUrl(zmfjImage);
+				loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+			}
+			return;
         } 
 		this.updateByDto(dto);
+		loanHomevisitInvestigateFileService.delByMainSid(dtoSid);
+		for (String yhkImage : yhkImages) {
+			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+			loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
+			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType());
+			if (yhkImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+				yhkImage = yhkImage.replace(fileUploadComponent.getUrlPrefix(), "");
+			}
+			loanHomevisitInvestigateFileDto.setFileUrl(yhkImage);
+			loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+		}
+		for (String gzsfpImage : gzsfpImages) {
+			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+			loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
+			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.GZSFP.getAttachType());
+			if (gzsfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+				gzsfpImage = gzsfpImage.replace(fileUploadComponent.getUrlPrefix(), "");
+			}
+			loanHomevisitInvestigateFileDto.setFileUrl(gzsfpImage);
+			loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+		}
+		for (String bxfpImage : bxfpImages) {
+			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+			loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
+			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BXFP.getAttachType());
+			if (bxfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+				bxfpImage = bxfpImage.replace(fileUploadComponent.getUrlPrefix(), "");
+			}
+			loanHomevisitInvestigateFileDto.setFileUrl(bxfpImage);
+			loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+		}
+		for (String bdImage : bdImages) {
+			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+			loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
+			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BD.getAttachType());
+			if (bdImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+				bdImage = bdImage.replace(fileUploadComponent.getUrlPrefix(), "");
+			}
+			loanHomevisitInvestigateFileDto.setFileUrl(bdImage);
+			loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+		}
+		for (String rzhtImage : rzhtImages) {
+			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+			loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
+			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.RZHT.getAttachType());
+			if (rzhtImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+				rzhtImage = rzhtImage.replace(fileUploadComponent.getUrlPrefix(), "");
+			}
+			loanHomevisitInvestigateFileDto.setFileUrl(rzhtImage);
+			loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+		}
+		for (String zmfjImage : zmfjImages) {
+			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+			loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
+			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.ZMFJ.getAttachType());
+			if (zmfjImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+				zmfjImage = zmfjImage.replace(fileUploadComponent.getUrlPrefix(), "");
+			}
+			loanHomevisitInvestigateFileDto.setFileUrl(zmfjImage);
+			loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+		}
 	}
 	
-	public void insertByDto(LoanFileexamineDto dto){
+	public String insertByDto(LoanFileexamineDto dto){
 		LoanFileexamine entity = new LoanFileexamine();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
 		baseMapper.insert(entity);
+		return entity.getSid();
 	}
 	
 	public void updateByDto(LoanFileexamineDto dto){

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java

@@ -33,4 +33,6 @@ public interface LoanFinOtherPolicyMapper extends BaseMapper<LoanFinOtherPolicy>
     List<OtherPolicyVo> selectListTwo(@Param("useOrgSid") String useOrgSid,@Param("name") String name);
 
     IPage<LoanFinOtherPolicyPageVo> selectPageVo(IPage<LoanFinOtherPolicy> page,@Param(Constants.WRAPPER)QueryWrapper<LoanPreloanCreditApply> qw);
+
+    List<LoanFinOtherPolicy> fetchByMainSid(String mainSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml

@@ -84,4 +84,11 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="fetchByMainSid"
+            resultType="com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy">
+        select *
+        from loan_fin_otherpolicy
+        where mainPolicySid = #{mainPolicySid}
+          and isDelete = '0'
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java

@@ -331,4 +331,8 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
         }
         return rb.success();
     }
+
+    public List<LoanFinOtherPolicy> fetchByMainSid(String mainSid) {
+        return baseMapper.fetchByMainSid(mainSid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml

@@ -55,6 +55,8 @@
                   , #{name}
                   , '%')
             </if>
+            and lfp.validDateTo
+              > now()
         </where>
         order by lfp.id desc
     </select>
@@ -66,7 +68,10 @@
                lfp.bankShortName,
                lfp.busTypeValue,
                lfp.vehCategoryValue,
-               lfp.isPack,
+               case lfp.isPack
+                   when 1 then '打包'
+                   when 0 then '不打包'
+                   end as isPack,
                lfp.guaranteeTypeKey,
                lfp.remarks,
                lfp.vehAccidentAmount,
@@ -107,18 +112,22 @@
         where lfp.filingState = 1
           and isPack = #{isPack}
         <if test="deptSid != null and deptSid != ''">
-            and lfp.useDeptSids like concat('%',#{deptSid},'%')
+            and lfp.useDeptSids like concat('%', #{deptSid}, '%')
         </if>
         <if test="vehTypeKey != null and vehTypeKey != ''">
-            and lfp.vehTypeKey like concat('%',#{vehTypeKey},'%')
+            and lfp.vehTypeKey like concat('%', #{vehTypeKey}, '%')
         </if>
-          and lfp.validDateTo > now() and lfp.useSate = 0 and lfp.riskState = 0
+        and lfp.validDateTo > now()
+        and lfp.useSate = 0
+        and lfp.riskState = 0
         <if test="name != null and name != ''">
             and lfp.policyName like concat('%', #{name}, '%')
         </if>
     </select>
 
     <select id="selectVehType" resultType="java.lang.String">
-        select vehicleType from anrui_base.base_vehicle_model where sid = #{modelSid}
+        select vehicleType
+        from anrui_base.base_vehicle_model
+        where sid = #{modelSid}
     </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java

@@ -86,7 +86,7 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
             return rb.setMsg("保证金类型不允许为空");
         }
         //期数
-        if(StringUtils.isBlank(dto.getPeriodKey())){
+        if (StringUtils.isBlank(dto.getPeriodKey())) {
             return rb.setMsg("期数不允许为空");
         }
         //标准年利率
@@ -415,13 +415,13 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
             if (loanFinPolicy == null) {
                 return rb.setMsg("选择中包含金融产品政策不存在的数据，请刷新后操作");
             }
-            if("1".equals(query.getUseState())){//useState为1时走停用，为0时走开启
+            if ("1".equals(query.getUseState())) {//useState为1时走停用，为0时走开启
-                if(loanFinPolicy.getUseSate() == 1){
+                if (loanFinPolicy.getUseSate() == 1) {
                     return rb.setMsg("该数据已是停用状态，不要重复操作");
                 }
             }
-            if("0".equals(query.getUseState())){
+            if ("0".equals(query.getUseState())) {
-                if(loanFinPolicy.getUseSate() == 0){
+                if (loanFinPolicy.getUseSate() == 0) {
                     return rb.setMsg("该数据已是开启状态，不要重复操作");
                 }
             }
@@ -553,13 +553,13 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
             if (loanFinPolicy == null) {
                 return rb.setMsg("选择中包含金融产品政策不存在的数据，请刷新后操作");
             }
-            if("1".equals(query.getRiskState())){//useState为1时走停用，为0时走开启
+            if ("1".equals(query.getRiskState())) {//useState为1时走停用，为0时走开启
-                if(loanFinPolicy.getRiskState() == 1){
+                if (loanFinPolicy.getRiskState() == 1) {
                     return rb.setMsg("该数据已是禁用状态，不要重复操作");
                 }
             }
-            if("0".equals(query.getRiskState())){
+            if ("0".equals(query.getRiskState())) {
-                if(loanFinPolicy.getRiskState() == 0){
+                if (loanFinPolicy.getRiskState() == 0) {
                     return rb.setMsg("该数据已是启用状态，不要重复操作");
                 }
             }
@@ -591,7 +591,7 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
         QueryWrapper<LoanFinPolicy> qw = new QueryWrapper<>();
         if (query != null) {
             //========================================数据授权开始
-            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+           /* PrivilegeQuery privilegeQuery = new PrivilegeQuery();
             privilegeQuery.setOrgPath(query.getOrgPath());
             privilegeQuery.setMenuSid(query.getMenuSid());
             privilegeQuery.setUserSid(query.getUserSid());
@@ -626,6 +626,12 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
             } else {
                 PagerVo<AppLoanFinPolicyVo> p = new PagerVo<>();
                 return p;
+            }*/
+            if (StringUtils.isNotBlank(query.getOrgPath())) {
+                String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+                qw.eq("lfp.useOrgSid", useOrgSid);
+                String deptSid = Arrays.asList(query.getOrgPath().split("/")).get(Arrays.asList(query.getOrgPath().split("/")).size()-1);
+                qw.like("lfp.useDeptSids", deptSid);
             }
             qw.eq("lfp.filingState", 1);
             qw.eq("lfp.useSate", 0);
@@ -646,9 +652,9 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
         }
         if (StringUtils.isNotBlank(appPolicyDetailsVo.getGuaranteeTypeKey())) {
             if ("01".equals(appPolicyDetailsVo.getGuaranteeTypeKey())) {
-                appPolicyDetailsVo.setIsGuarantee("1");
+                appPolicyDetailsVo.setIsGuarantee("担保");
             } else {
-                appPolicyDetailsVo.setIsGuarantee("0");
+                appPolicyDetailsVo.setIsGuarantee("非担保");
             }
         }
         if (appPolicyDetailsVo.getIsOtherProduct() == 1) {//有其他融
@@ -660,12 +666,12 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
         return rb.success().setData(appPolicyDetailsVo);
     }
 
-    public ResultBean<List<PolicyVo>> selectList(String orgPath, String userSid, String isPack, String name,String modelSid) {
+    public ResultBean<List<PolicyVo>> selectList(String orgPath, String userSid, String isPack, String name, String modelSid) {
         ResultBean<List<PolicyVo>> rb = ResultBean.fireFail();
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         String vehTypeKey = baseMapper.selectVehType(modelSid);
-        String deptSid = Arrays.asList(orgPath.split("/")).get(Arrays.asList(orgPath.split("/")).size()-1);
+        String deptSid = Arrays.asList(orgPath.split("/")).get(Arrays.asList(orgPath.split("/")).size() - 1);
-        List<PolicyVo> list = baseMapper.selectListOne(deptSid, isPack, name,vehTypeKey);
+        List<PolicyVo> list = baseMapper.selectListOne(deptSid, isPack, name, vehTypeKey);
         list.removeAll(Collections.singleton(null));
         return rb.success().setData(list);
     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java

@@ -237,7 +237,8 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService<LoanFinP
             LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(psid);
             BeanUtil.copyProperties(loanFinPolicy, initVo);
             initVo.setPolicySid(psid);
-            List<LoanFinOtherPolicy> otherPolicy = loanFinOtherPolicyService.getOtherPolicyByMainSid(psid);
+           // List<LoanFinOtherPolicy> otherPolicy = loanFinOtherPolicyService.getOtherPolicyByMainSid(psid);
+            List<LoanFinOtherPolicy> otherPolicy = loanFinOtherPolicyService.fetchByMainSid(psid);
             otherPolicy.removeAll(Collections.singleton(null));
             initVo.setShowOtherPolicy(!otherPolicy.isEmpty());
             for (LoanFinOtherPolicy loanFinOtherPolicy : otherPolicy) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepRest.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.biz.loanhomevisitprep;
 
+import com.yxt.anrui.riskcenter.api.loanhomevisitprep.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -35,13 +36,6 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrep;
-import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepQuery;
-import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepDto;
-import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepFeign;
-
 /**
  * Project: anrui-riskcenter(家访准备) <br/>
  * File: LoanHomevisitPrepFeignFallback.java <br/>
@@ -113,4 +107,9 @@ public class LoanHomevisitPrepRest implements LoanHomevisitPrepFeign {
     public ResultBean saveLoanCon(String sid, String conSetUpKey) {
         return loanHomevisitPrepService.saveLoanCon(sid, conSetUpKey);
     }
+
+    @Override
+    public ResultBean saveHomeVisit(HomeVisitDto dto) {
+        return loanHomevisitPrepService.saveHomeVisit(dto);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -42,6 +42,7 @@ import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderFeig
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate;
+import com.yxt.anrui.riskcenter.api.loanhomevisitprep.*;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyVo;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService;
 import org.apache.commons.lang3.StringUtils;
@@ -50,12 +51,6 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrep;
-import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepQuery;
-import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepDto;
-import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepFeign;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -214,7 +209,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         loanHomevisitInvestigate.setSaleOrderBorrowerSid(loanHomevisitPrep.getSaleOrderBorrowerSid());
         loanHomevisitInvestigateService.save(loanHomevisitInvestigate);
         //修改销售订单贷款人家访状态
-        busSalesOrderBorrowerFeign.updateBusNo("302",loanHomevisitPrep.getSaleOrderBorrowerSid());
+        busSalesOrderBorrowerFeign.updateBusNo("302", loanHomevisitPrep.getSaleOrderBorrowerSid());
         //修改车辆状态表家访状态
         List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSid(loanHomevisitPrep.getSaleOrderSid()).getData();
         List<BaseVehicleStateDto> baseVehicleStateDtoArrayList = new ArrayList<>();
@@ -276,4 +271,12 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         }
         return rb.success();
     }
+
+    public ResultBean saveHomeVisit(HomeVisitDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanHomevisitPrep loanHomevisitPrep = new LoanHomevisitPrep();
+        BeanUtil.copyProperties(dto, loanHomevisitPrep, "sid");
+        baseMapper.insert(loanHomevisitPrep);
+        return rb.success();
+    }
 }

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

@@ -22,10 +22,12 @@
     </select>
 
     <select id="getOrderLoanPagerList" resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanVo">
-        select distinct(la.idCard),la.custSid,la.custName,DATE_FORMAT(la.createTime, '%Y-%m-%d') as createTime,la.phone,la.gsfkjg,la.capitalName,
+        select distinct(la.idCard),la.custSid,
+        la.custName,DATE_FORMAT(la.createTime, '%Y-%m-%d') as createTime,
+        la.phone,la.gsfkjg,la.capitalName,
         la.zffkjg,
-        la.capitalName,
+        lp.peoName,
-        lp.peoName
+        la.sid
         from loan_preloan_credit_apply la
         left join loan_preloan_credit_peo lp on la.sid = lp.mainSid
         <where>
@@ -41,7 +43,7 @@
                 , '%')
             </if>
         </where>
-        order by id desc
+        order by la.id desc
     </select>
 
     <select id="judgeIsLoan" resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply">

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

@@ -36,6 +36,7 @@ import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.*;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDto;
+import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplate;
 import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateQuery;
 import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateVo;
@@ -43,6 +44,7 @@ import com.yxt.anrui.riskcenter.biz.loancreditappealapply.LoanCreditAppealApplyS
 import com.yxt.anrui.riskcenter.biz.loanpreloancreditpeo.LoanPreloanCreditPeoService;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -70,6 +72,8 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
     private LoanPreloanCreditPeoService loanPreloanCreditPeoService;
     @Autowired
     private LoanCreditAppealApplyService loanCreditAppealApplyService;
+    @Autowired
+    private LoanSolutionsService loanSolutionsService;
 
     public PagerVo<LoanPreloanCreditApplyVo> listPageVo(PagerQuery<LoanPreloanCreditApplyQuery> pq) {
         LoanPreloanCreditApplyQuery query = pq.getParams();
@@ -579,6 +583,13 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
 
     public ResultBean<LoanOrderPreloanVo> judgeIsLoan(String sid) {
         ResultBean<LoanOrderPreloanVo> rb = ResultBean.fireFail();
+        //自营非担保业务不用对实际购车人进行信用审核，只需要对贷款人进行资方信用审核。
+        LoanSolutions loanSolutions = loanSolutionsService.selectByApplySid(sid);
+        if(loanSolutions != null){
+            if("01".equals(loanSolutions.getTypeKey())){
+                return rb.success();
+            }
+        }
         //查询销售订单的实际购车人也就是客户是否已信用审核通过
         LoanPreloanCreditApply loanPreloanCreditApply = baseMapper.judgeIsLoan(sid);
         LoanOrderPreloanVo loanOrderPreloanVo = baseMapper.judgeIsLoan2(sid);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -7,6 +7,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrdersVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.OrderSolutionVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
@@ -1656,6 +1657,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             BusSalesOrdersVo busSalesOrdersVo = resultBean.getData();
             solutionssVo.setSzPrice(busSalesOrdersVo.getSzPrice());
             solutionssVo.setFinalPrice(busSalesOrdersVo.getFinalPrice());
+            BusSalesOrderModel busSalesOrderModel = busSalesOrdersVo.getBusSalesOrderModel();
+            solutionssVo.setModelSid(busSalesOrderModel.getModelSid());
             if (busSalesOrdersVo.getBusSalesOrder() != null) {
                 BusSalesOrder busSalesOrder = busSalesOrdersVo.getBusSalesOrder();
                 //全款且为三方金融

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java

@@ -1007,8 +1007,13 @@ public class LoanTemplateService extends MybatisBaseService<LoanTemplateMapper,
         AppLoanTemplateQuery query = pagerQuery.getParams();
         QueryWrapper<LoanTemplate> qw = new QueryWrapper<>();
         if (query != null) {
-            qw.eq("lfp.orgSidPath", query.getOrgPath());
+            if(StringUtils.isNotBlank(query.getOrgPath())){
+                String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+                qw.eq("lfp.useOrgSid",useOrgSid);
+            }
+//            qw.eq("lfp.orgSidPath", query.getOrgPath());
             qw.eq("lfp.nodeState", "已办结");
+            qw.eq("lfp.useState",0);
         }
         IPage<LoanTemplate> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AppLoanTemplateVo> pagging = baseMapper.getCustomizedList(page, qw, query.getName());

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@@ -328,7 +328,7 @@ public interface AppBusSalesOrderFeign {
     @ApiOperation("初始化录入贷款人列表")
     @GetMapping("/init/saleOrderInputLender/{saleOrderSid}")
     @ResponseBody
-    ResultBean<InputLenderVo> saleOrderInputLender(@PathVariable("saleOrderSid") String saleOrderSid);
+    ResultBean<InputLenderVo> initSaleOrderInputLender(@PathVariable("saleOrderSid") String saleOrderSid);
 
     @ApiOperation("删除销售订单贷款人")
     @DeleteMapping("/delete/saleOrderInputLender/{sid}")
@@ -345,4 +345,9 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean saleOrderInputLenderOwn(@PathVariable("saleOrderSid")String saleOrderSid);
 
+    @ApiOperation("保存销售订单贷款人")
+    @PostMapping("/save/saleOrderInputLender/{saleOrderSid}/{sid}")
+    @ResponseBody
+    ResultBean<InputLenderVo> saleOrderInputLender(@PathVariable("saleOrderSid")String saleOrderSid,@PathVariable("sid")String sid);
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@@ -292,7 +292,7 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean<InputLenderVo> saleOrderInputLender(String saleOrderSid) {
+    public ResultBean<InputLenderVo> initSaleOrderInputLender(String saleOrderSid) {
         return null;
     }
 
@@ -310,4 +310,9 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
         return null;
     }
+
+    @Override
+    public ResultBean<InputLenderVo> saleOrderInputLender(String saleOrderSid, String sid) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java

@@ -204,5 +204,7 @@ public class AppSolutionVo {
     private String serviceChargeTypeKey;
     private String serviceChargeTypeValue;
 
+    private String modelSid;
+
 
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -385,8 +385,8 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean<InputLenderVo> saleOrderInputLender(String saleOrderSid) {
+    public ResultBean<InputLenderVo> initSaleOrderInputLender(String saleOrderSid) {
-        return appBusSalesOrderService.saleOrderInputLender(saleOrderSid);
+        return appBusSalesOrderService.initSaleOrderInputLender(saleOrderSid);
     }
 
     @Override
@@ -404,4 +404,9 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.saleOrderInputLenderOwn(saleOrderSid);
     }
 
+    @Override
+    public ResultBean<InputLenderVo> saleOrderInputLender(String saleOrderSid, String sid) {
+        return appBusSalesOrderService.saleOrderInputLender(saleOrderSid,sid);
+    }
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -753,7 +753,7 @@ public class AppBusSalesOrderService {
         return rb.success().setData(vinNoVo);
     }
 
-    public ResultBean<InputLenderVo> saleOrderInputLender(String saleOrderSid) {
+    public ResultBean<InputLenderVo> initSaleOrderInputLender(String saleOrderSid) {
         ResultBean<InputLenderVo> rb = ResultBean.fireFail();
         InputLenderVo inputLenderVo = new InputLenderVo();
         ResultBean<SalesLenderVo> resultBean = busSalesOrderFeign.saleOrderInputLender(saleOrderSid);
@@ -773,4 +773,13 @@ public class AppBusSalesOrderService {
     public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
         return busSalesOrderFeign.saleOrderInputLenderOwn(saleOrderSid);
     }
+
+    public ResultBean<InputLenderVo> saleOrderInputLender(String saleOrderSid, String sid) {
+        ResultBean<InputLenderVo> rb = ResultBean.fireFail();
+        InputLenderVo inputLenderVo = new InputLenderVo();
+        ResultBean<SalesLenderVo> resultBean = busSalesOrderFeign.saveSaleOrderInputLender(saleOrderSid,sid);
+        SalesLenderVo vinVo = resultBean.getData();
+        BeanUtil.copyProperties(vinVo, inputLenderVo);
+        return rb.success().setData(inputLenderVo);
+    }
 }