From f906158b40c87ca1cd793c9c3dcb797a06a73b52 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 13 Sep 2023 10:56:24 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/api/basevehicleout/BaseJRFAVo.java | 102 +++++--- .../basevehicleout/BaseSolutionListVo.java | 26 ++ .../basevehicleout/BaseVehicleOutFeign.java | 1 + .../basevehicleout/BaseVehicleOutService.java | 226 +++++++++++------- .../BusSalesOrderLoancontract.java | 2 +- 5 files changed, 236 insertions(+), 121 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseSolutionListVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseJRFAVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseJRFAVo.java index d3c547e83e..017d278874 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseJRFAVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseJRFAVo.java @@ -1,51 +1,81 @@ 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("是否打包") + @ApiModelProperty("关联sid") + private String busSid; + @ApiModelProperty("是否打包：1打包，0不打包") private String isPack; - @ApiModelProperty("产品政策") + @ApiModelProperty("产品政策名称") private String policyName; - @ApiModelProperty("融资项目") - private String financProject; + @ApiModelProperty("产品政策sid") + private String policySid; @ApiModelProperty("融资项目总额") private String loanTotal; - @ApiModelProperty("首付比例") + @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("产品贷款金额") + @ApiModelProperty("贷款金额") private String loanAmount; - @ApiModelProperty("产品期数") + @ApiModelProperty("贷款期数") private String loanPeriod; - @ApiModelProperty("贷款保证金比例") + @ApiModelProperty("保证金比例") private String bondRatio; - @ApiModelProperty("贷款保证金") + @ApiModelProperty("保证金金额") private String bondAmount; @ApiModelProperty("厂家贴息") private String factoryDiscount; - @ApiModelProperty("贴息用途") + @ApiModelProperty("厂家贴息用途") private String factoryDiscountUse; - @ApiModelProperty("年利率（%）") + @ApiModelProperty("年利率") private String policyYearRatio; - @ApiModelProperty("月还金额") + @ApiModelProperty("贷款月还") private String loanPayMoney; - @ApiModelProperty("利息总额") + @ApiModelProperty("贷款利息") private String loanInterest; @ApiModelProperty("贴息抵车款") private String discountCar; - - //其他融 @ApiModelProperty("是否勾选其它融") private boolean otherPolicyState; + /**************************其他融*********************************/ + private boolean otherPolicyIsMain; @ApiModelProperty("其它融名称") private String otherPolicyName; - @ApiModelProperty("其它融贷款金额") + @ApiModelProperty("其他融sid") + private String otherPolicySid; + @ApiModelProperty("其它融金额") private String otherPolicyAmount; @ApiModelProperty("其它融期数") private String otherPolicyPeriod; @@ -55,12 +85,9 @@ public class BaseJRFAVo { private String otherPolicyInterest; @ApiModelProperty("其它融年利率") private String otherPolicyYearRatio; - - //方案汇总 - @ApiModelProperty("融资首付") + /*************************方案汇总*********************************/ + @ApiModelProperty("'融资首付") private String loanDownPay; - @ApiModelProperty("实际首付比例") - private String downPayAmountsRatio; @ApiModelProperty("总贷款金额") private String loanAmountTotal; @ApiModelProperty("期数") @@ -72,9 +99,11 @@ public class BaseJRFAVo { @ApiModelProperty("预计首期还款日") private String returnTime; - //应收明细 + /***************************金融方案应收明细*******************************/ @ApiModelProperty("融资首付") private String downPayAmounts; + @ApiModelProperty("实际首付比例") + private String downPayAmountsRatio; @ApiModelProperty("贷款保证金") private String bondAmounts; @ApiModelProperty("保险保证金") @@ -97,24 +126,43 @@ public class BaseJRFAVo { 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 receivableTotal; - @ApiModelProperty("抵顶费用合计") - private String offsetTotal; @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 financeForms = new ArrayList<>(); + + + private String serviceChargeTypeKey; + private String serviceChargeTypeValue; + + private String modelSid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseSolutionListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseSolutionListVo.java new file mode 100644 index 0000000000..140165aa87 --- /dev/null +++ b/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; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java index c8cb5eacc1..9538f36f3f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java @@ -105,6 +105,7 @@ public interface BaseVehicleOutFeign { @ApiOperation(("打印交接单")) @PostMapping("/createjrbjdPdf") + @ResponseBody public ResultBean createjrbjdPdf(@RequestParam("sid") String sid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 1344247218..a785e82dc6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -71,6 +71,7 @@ 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; @@ -82,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.*; @@ -146,6 +148,8 @@ public class BaseVehicleOutService extends MybatisBaseService vehicleOut(BaseVehicleOutDto dto) { log.info("BaseVehicleOutService-vehicleOut-95:{}", JSONObject.toJSONString(dto)); @@ -2280,7 +2284,7 @@ public class BaseVehicleOutService extends MybatisBaseService 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", baseQuotationVo.getVinNo()); - dataMap.put("mobile", baseQuotationVo.getMobile()); - dataMap.put("address", baseQuotationVo.getAddress()); - dataMap.put("affiliatedCompany", baseQuotationVo.getAffiliatedCompany()); - //车型及价格 - dataMap.put("modelName", baseQuotationVo.getModelName()); - dataMap.put("gcOneModel", baseQuotationVo.getGcOneModel()); - dataMap.put("gcOnePurUnit", baseQuotationVo.getGcOnePurUnit()); - dataMap.put("gcTwoModel", baseQuotationVo.getGcTwoModel()); - dataMap.put("gcTwoPurUnit", baseQuotationVo.getGcTwoPurUnit()); - dataMap.put("szOneName", baseQuotationVo.getSzOneName()); - dataMap.put("szOnePurUnit", baseQuotationVo.getSzOnePurUnit()); - dataMap.put("szTwoName", baseQuotationVo.getSzTwoName()); - dataMap.put("szTwoPurUnit", baseQuotationVo.getSzTwoPurUnit()); - 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文件名 + //查询出库申请 + BusDeliveredApply busDeliveredApply = busDeliveredApplyFeign.fetchBySid(sid).getData(); + //查询出库申请车辆表 + List busDeliveredApplyDetails = busDeliveredApplyDetailsFeign.selectByApplySid(busDeliveredApply.getSid()).getData(); + //销售订单 + BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(busDeliveredApply.getContractNo()).getData(); + List filesList = new ArrayList<>(); + for (int i = 0; i < busDeliveredApplyDetails.size(); i++) { + Map 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 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"); - 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, ""); - pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName); + try { + File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + dateStr + "/" + typeName); + } catch (Exception e) { + e.printStackTrace(); + } + pdfPath.setPdfPath("/template/" + dateStr + "/" + typeName); return pdfPath; } } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontract.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontract.java index 4892e3e16b..cb3b356d92 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontract.java +++ b/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("资方名称") From b61af6f59c2b89ab267d166b8ba5b19112050ad8 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 13 Sep 2023 11:45:49 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9E=8D?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=94=BF=E7=AD=96=E7=AE=A1=E7=90=86=E3=80=81?= =?UTF-8?q?=E5=85=B6=E5=AE=83=E8=9E=8D=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../financialpolicymanagementAdd.vue | 47 ++++++++++--------- .../otherfinancialpolicymanagementAdd.vue | 4 +- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue b/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue index 115a3f8e30..23903748ee 100644 --- a/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue +++ b/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue @@ -553,17 +553,41 @@ export default { saveOrUpdate() { this.$refs['form_obj'].validate((valid) => { if (valid) { + if (this.formobj.isOtherProduct) { + if (this.formobj.loanFinOtherPolicy.productTypeKey === '') { + this.$message({ showClose: true, type: 'error', message: '其它融中产品类别不能为空' }) + return + } + if (this.formobj.loanFinOtherPolicy.maxLoanRatio === '') { + this.$message({ showClose: true, type: 'error', message: '其它融中最高融资比例不能为空' }) + return + } + if (this.formobj.loanFinOtherPolicy.maxLoanAmount === '') { + this.$message({ showClose: true, type: 'error', message: '其它融中最高融资额不能为空' }) + return + } + if (this.formobj.loanFinOtherPolicy.periodKey === '') { + this.$message({ showClose: true, type: 'error', message: '其它融中期数不能为空' }) + return + } + if (this.formobj.loanFinOtherPolicy.yearRatio === '') { + this.$message({ showClose: true, type: 'error', message: '其它融中年利率不能为空' }) + return + } + } if (this.useDept_list.length > 0) { + const aa = [] for (var i = 0; i < this.orgList.length; i++) { for (var k = 0; k < this.useDept_list.length; k++) { if (this.orgList[i].orgDeptSid === this.useDept_list[k]) { - this.formobj.useDeptList.push({ + aa.push({ deptName: this.orgList[i].orgDeptName, deptSid: this.orgList[i].orgDeptSid }) } } } + this.formobj.useDeptList = aa } else { this.$message({ showClose: true, type: 'error', message: '适用销售部门不能为空' }) return @@ -583,27 +607,6 @@ export default { this.formobj.vehTypeValueList = [] return } - if (this.formobj.isOtherProduct) { - if (this.formobj.loanFinOtherPolicy.productTypeKey === '') { - this.$message({ showClose: true, type: 'error', message: '其它融中产品类别不能为空' }) - return - } - if (this.formobj.loanFinOtherPolicy.maxLoanRatio === '') { - this.$message({ showClose: true, type: 'error', message: '其它融中最高融资比例不能为空' }) - return - }if (this.formobj.loanFinOtherPolicy.maxLoanAmount === '') { - this.$message({ showClose: true, type: 'error', message: '其它融中最高融资额不能为空' }) - return - } - if (this.formobj.loanFinOtherPolicy.periodKey === '') { - this.$message({ showClose: true, type: 'error', message: '其它融中期数不能为空' }) - return - } - if (this.formobj.loanFinOtherPolicy.yearRatio === '') { - this.$message({ showClose: true, type: 'error', message: '其它融中年利率不能为空' }) - return - } - } this.submitdisabled = true // 保存 req.saveOrUpdate(this.formobj).then((res) => { diff --git a/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue b/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue index 9e1bb9ca21..af3d6c6eab 100644 --- a/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue +++ b/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue @@ -302,16 +302,18 @@ export default { this.$refs['form_obj'].validate((valid) => { if (valid) { if (this.useDept_list.length > 0) { + const aa = [] for (var i = 0; i < this.orgList.length; i++) { for (var k = 0; k < this.useDept_list.length; k++) { if (this.orgList[i].orgDeptSid === this.useDept_list[k]) { - this.formobj.useDeptList.push({ + aa.push({ deptName: this.orgList[i].orgDeptName, deptSid: this.orgList[i].orgDeptSid }) } } } + this.formobj.useDeptList = aa } if (this.formobj.vehTypeKeyList.length > 0) { const aa = [] From 02d3e4fb55219f92bb5e5fa10c210f4773e3d033 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 13 Sep 2023 11:51:08 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanFinOtherPolicyFeign.java | 2 +- .../LoanFinOtherPolicyMapper.java | 2 +- .../LoanFinOtherPolicyMapper.xml | 39 ++++++++- .../LoanFinOtherPolicyRest.java | 4 +- .../LoanFinOtherPolicyService.java | 10 ++- .../loanfinpolicy/LoanFinPolicyMapper.java | 4 +- .../biz/loanfinpolicy/LoanFinPolicyMapper.xml | 84 ++++++++++++++++++- .../loanfinpolicy/LoanFinPolicyService.java | 19 +++-- .../api/risk/solutions/SolutionsFeign.java | 2 +- .../biz/risk/solutions/SolutionsRest.java | 4 +- .../biz/risk/solutions/SolutionsService.java | 4 +- 11 files changed, 148 insertions(+), 26 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java index 5c581f8ca7..94a881d1c6 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java @@ -49,7 +49,7 @@ public interface LoanFinOtherPolicyFeign { @GetMapping("selectList") @ApiOperation("获取产品政策下其他融，或分公司下其他融") - ResultBean> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name); + ResultBean> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid); @ApiOperation("使用状态停用、开启:useState为1时走停用，为0时走开启") @PostMapping("setState") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java index a875c2a125..e29c3233e6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java @@ -30,7 +30,7 @@ public interface LoanFinOtherPolicyMapper extends BaseMapper List selectListOne(@Param("sid") String sid,@Param("name") String name); - List selectListTwo(@Param("useOrgSid") String useOrgSid,@Param("name") String name); + List selectListTwo(@Param("useOrgSid") String useOrgSid,@Param("name") String name,@Param("type") String type,@Param("deptSid") String deptSid); IPage selectPageVo(IPage page,@Param(Constants.WRAPPER)QueryWrapper qw); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml index a0e3afa7db..92b1154bf2 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml @@ -36,23 +36,56 @@ + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java index 795956e099..2a23052f0b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java @@ -65,4 +65,9 @@ public class BusTransferRecordsRest implements BusTransferRecordsFeign { public ResultBean confirmRecords(ConfirmRecordsQuery query) { return busTransferRecordsService.confirmRecords(query); } + + @Override + public ResultBean selectByVinSidAndKey(String vinSid, String goodsTypeKey) { + return busTransferRecordsService.selectByVinSidAndKey(vinSid,goodsTypeKey); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java index 6a4b49c7db..4ccee7797b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java @@ -340,4 +340,10 @@ public class BusTransferRecordsService extends MybatisBaseService selectByVinSidAndKey(String vinSid, String goodsTypeKey) { + ResultBean rb = ResultBean.fireFail(); + BusTransferRecords BusTransferRecords = baseMapper.selectByVinSidAndKey(vinSid, goodsTypeKey); + return rb.success().setData(BusTransferRecords); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDetailsVo.java index 7ee686bf18..db46ab2dc3 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDetailsVo.java @@ -63,6 +63,10 @@ public class LoanFileexamineDetailsVo implements Vo { private String staffName; @ApiModelProperty("车架号拼接") private String vinNo; + @ApiModelProperty("合格证图片") + private List hgzImages; + @ApiModelProperty("发票图片") + private List fpImages; @ApiModelProperty("银行卡") private List yhkImages; @ApiModelProperty("购置税发票") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java index 6184b986e1..0d07f8add8 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java @@ -69,10 +69,6 @@ public class LoanFileexamineQuery implements Query { private String bankContractNo; @ApiModelProperty("资方状态value") private String bankStateValue; - @ApiModelProperty("电子件状态") - private String dzjState; - @ApiModelProperty("原件状态") - private String yjState; @ApiModelProperty("资料状态") private String zlState; @ApiModelProperty("组织全路径") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java index c900b7a91d..5de63ced3e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java @@ -59,10 +59,6 @@ public class LoanFileexamineVo implements Vo { private String staffName; @ApiModelProperty("资方状态value") private String bankStateValue; - @ApiModelProperty("电子件状态") - private String dzjState; - @ApiModelProperty("原件状态") - private String yjState; @ApiModelProperty("资料状态") private String zlState; @ApiModelProperty("消贷合同编号") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml index 9edda0eb33..4d2fc6e9b5 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml @@ -10,8 +10,7 @@ bo.`orgName`, bo.`staffName`, lf.`bankStateValue`, - IF(lf.`dzjState` = '0', '未齐全', '已齐全'), - IF(lf.`yjState` = '0', '未齐全', '已齐全'), + IF(lf.`zlState` = '0', '未齐全', '已齐全'), bl.`loanContractNo`, bl.`vehCount` AS num, bl.`borrowerName`, diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java index e6d2109997..9bb25ec551 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java @@ -28,6 +28,9 @@ package com.yxt.anrui.riskcenter.biz.loanfileexamine; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign; +import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; +import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo; @@ -35,6 +38,8 @@ import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoanco import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderFeign; +import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecords; +import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; @@ -79,324 +84,349 @@ import java.util.List; @Service public class LoanFileexamineService extends MybatisBaseService { - @Autowired - private SysUserFeign sysUserFeign; - @Autowired - private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign; - @Autowired - private BusSalesOrderFeign busSalesOrderFeign; - @Autowired - private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign; - @Autowired - private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService; - @Autowired - private FileUploadComponent fileUploadComponent; + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign; + @Autowired + private BusSalesOrderFeign busSalesOrderFeign; + @Autowired + private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign; + @Autowired + private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService; + @Autowired + private FileUploadComponent fileUploadComponent; + @Autowired + private BaseVehicleAppendixFeign baseVehicleAppendixFeign; + @Autowired + private BaseVehicleCertificateFeign baseVehicleCertificateFeign; + @Autowired + private BusTransferRecordsFeign busTransferRecordsFeign; - public PagerVo listPageVo(PagerQuery pq) { - LoanFileexamineQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("bl.busNo",305); - if (StringUtils.isNotBlank(query.getMenuUrl())) { - //======================= - PrivilegeQuery privilegeQuery = new PrivilegeQuery(); - privilegeQuery.setOrgPath(query.getOrgSidPath()); - privilegeQuery.setMenuUrl(query.getMenuUrl()); - privilegeQuery.setUserSid(query.getUserSid()); - ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { - //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) - String orgSidPath = query.getOrgSidPath(); - orgSidPath = orgSidPath + "/"; - int i1 = orgSidPath.indexOf("/"); - int i2 = orgSidPath.indexOf("/", i1 + 1); - int i3 = orgSidPath.indexOf("/", i2 + 1); - int i4 = orgSidPath.indexOf("/", i3 + 1); - String orgLevelKey = defaultIdReltBean.getData(); - if ("1".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i1); - qw.like("bo.orgSidPath", orgSidPath); - } else if ("2".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i2); - qw.like("bo.orgSidPath", orgSidPath); - } else if ("3".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i3); - qw.like("bo.orgSidPath", orgSidPath); - } else if ("4".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i4); - qw.like("bo.orgSidPath", orgSidPath); - } else if ("5".equals(orgLevelKey)) { - qw.eq("bo.createBySid", query.getUserSid()); - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } - if (StringUtils.isNotBlank(query.getUseOrgName())) { - qw.like("bo.useOrgName", query.getUseOrgName()); - } - if (StringUtils.isNotBlank(query.getSaleDeptName())) { - qw.like("bo.orgName", query.getSaleDeptName()); - } - if (StringUtils.isNotBlank(query.getStaffName())) { - qw.like("bo.staffName", query.getStaffName()); - } - if (StringUtils.isNotBlank(query.getLoanContractNo())) { - qw.like("bl.loanContractNo", query.getLoanContractNo()); - } - if (StringUtils.isNotBlank(query.getLoanPeoName())) { - qw.like("bl.borrowerName", query.getLoanPeoName()); - } - if (StringUtils.isNotBlank(query.getBankName())) { - qw.like("bl.bankName", query.getBankName()); - } - if (StringUtils.isNotBlank(query.getPolicyName())) { - qw.like("bl.policyName", query.getPolicyName()); - } - if (StringUtils.isNotBlank(query.getBankContractNo())) { - qw.like("bl.bankContractNo", query.getBankContractNo()); - } - if (StringUtils.isNotBlank(query.getBankStateValue())) { - qw.like("lf.bankStateValue", query.getBankStateValue()); - } - if (StringUtils.isNotBlank(query.getDzjState())) { - qw.eq("lf.dzjState", query.getDzjState()); - } - if (StringUtils.isNotBlank(query.getYjState())) { - qw.eq("lf.yjState", query.getYjState()); - } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(LoanFileexamineDto dto){ + public PagerVo listPageVo(PagerQuery pq) { + LoanFileexamineQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("bl.busNo", 305); + if (StringUtils.isNotBlank(query.getMenuUrl())) { + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgSidPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgSidPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("bo.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getUseOrgName())) { + qw.like("bo.useOrgName", query.getUseOrgName()); + } + if (StringUtils.isNotBlank(query.getSaleDeptName())) { + qw.like("bo.orgName", query.getSaleDeptName()); + } + if (StringUtils.isNotBlank(query.getStaffName())) { + qw.like("bo.staffName", query.getStaffName()); + } + if (StringUtils.isNotBlank(query.getLoanContractNo())) { + qw.like("bl.loanContractNo", query.getLoanContractNo()); + } + if (StringUtils.isNotBlank(query.getLoanPeoName())) { + qw.like("bl.borrowerName", query.getLoanPeoName()); + } + if (StringUtils.isNotBlank(query.getBankName())) { + qw.like("bl.bankName", query.getBankName()); + } + if (StringUtils.isNotBlank(query.getPolicyName())) { + qw.like("bl.policyName", query.getPolicyName()); + } + if (StringUtils.isNotBlank(query.getBankContractNo())) { + qw.like("bl.bankContractNo", query.getBankContractNo()); + } + if (StringUtils.isNotBlank(query.getBankStateValue())) { + qw.like("lf.bankStateValue", query.getBankStateValue()); + } + if (StringUtils.isNotBlank(query.getZlState())) { + qw.eq("lf.zlState", query.getZlState()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(LoanFileexamineDto dto) { String dtoSid = dto.getSid(); - List yhkImages = dto.getYhkImages(); - List gzsfpImages = dto.getGzsfpImages(); - List bxfpImages = dto.getBxfpImages(); - List bdImages = dto.getBdImages(); - List rzhtImages = dto.getRzhtImages(); - List 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 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){ - String dtoSid = dto.getSid(); + List yhkImages = dto.getYhkImages(); + List gzsfpImages = dto.getGzsfpImages(); + List bxfpImages = dto.getBxfpImages(); + List bdImages = dto.getBdImages(); + List rzhtImages = dto.getRzhtImages(); + List 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; - } - LoanFileexamine entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public LoanFileexamineDetailsVo fetchDetailsVoBySid(String sid){ - LoanFileexamine entity = fetchBySid(sid); - LoanFileexamineDetailsVo vo = new LoanFileexamineDetailsVo(); - BeanUtil.copyProperties(entity, vo); - BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(entity.getLoanContractSid()).getData(); - vo.setLoanContractNo(busSalesOrderLoancontractDetailsVo.getLoanContractNo()); - vo.setBorrowerName(busSalesOrderLoancontractDetailsVo.getBorrowerName()); - vo.setNum(busSalesOrderLoancontractDetailsVo.getVehCount()); - BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(entity.getSaleOrderSid()).getData(); - vo.setStaffName(busSalesOrder.getStaffName()); - List busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSid(entity.getSaleOrderSid()).getData(); - String vinNos = ""; - for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { - vinNos = vinNos + busSalesOrderVehicle.getLinkNo() + ","; - } - vo.setVinNo(vinNos.substring(0,vinNos.lastIndexOf(","))); - //银行卡 - List yhkVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType()); - List yhkImages = new ArrayList<>(); - if (yhkVos != null && yhkVos.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : yhkVos) { - yhkImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); - } - } - vo.setYhkImages(yhkImages); - //购置税发票 - List gzsfpVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.GZSFP.getAttachType()); - List gzsfpImages = new ArrayList<>(); - if (gzsfpVos != null && gzsfpVos.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : gzsfpVos) { - gzsfpImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); - } - } - vo.setGzsfpImages(gzsfpImages); - //保险发票 - List bxfpVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.BXFP.getAttachType()); - List bxfpImages = new ArrayList<>(); - if (bxfpVos != null && bxfpVos.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : bxfpVos) { - bxfpImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); - } - } - vo.setBxfpImages(bxfpImages); - //保单 - List bdVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.BD.getAttachType()); - List bdImages = new ArrayList<>(); - if (bdVos != null && bdVos.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : bdVos) { - bdImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); - } - } - vo.setBdImages(bdImages); - //融资合同 - List rzhtVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.RZHT.getAttachType()); - List rzhtImages = new ArrayList<>(); - if (rzhtVos != null && rzhtVos.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : rzhtVos) { - rzhtImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); - } - } - vo.setRzhtImages(rzhtImages); - //证明附件 - List zmfjVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.ZMFJ.getAttachType()); - List zmfjImages = new ArrayList<>(); - if (zmfjVos != null && zmfjVos.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : zmfjVos) { - zmfjImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); - } - } - vo.setZmfjImages(zmfjImages); - return vo; - } + } + 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 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) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + LoanFileexamine entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public LoanFileexamineDetailsVo fetchDetailsVoBySid(String sid) { + LoanFileexamine entity = fetchBySid(sid); + LoanFileexamineDetailsVo vo = new LoanFileexamineDetailsVo(); + BeanUtil.copyProperties(entity, vo); + BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(entity.getLoanContractSid()).getData(); + vo.setLoanContractNo(busSalesOrderLoancontractDetailsVo.getLoanContractNo()); + vo.setBorrowerName(busSalesOrderLoancontractDetailsVo.getBorrowerName()); + vo.setNum(busSalesOrderLoancontractDetailsVo.getVehCount()); + BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(entity.getSaleOrderSid()).getData(); + vo.setStaffName(busSalesOrder.getStaffName()); + List busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSid(entity.getSaleOrderSid()).getData(); + String vinNos = ""; + for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { + vinNos = vinNos + busSalesOrderVehicle.getLinkNo() + ","; + } + vo.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(","))); + List hgzImages = new ArrayList<>(); + List fpImages = new ArrayList<>(); + for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { + BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(busSalesOrderVehicle.getLinkSid()).getData(); + //合格证 + List stringList = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData(); + for (String s : stringList) { + hgzImages.add(s); + } + BusTransferRecords busTransferRecords = busTransferRecordsFeign.selectByVinSidAndKey(busSalesOrderVehicle.getLinkSid(), "01").getData(); + String transferFiles = busTransferRecords.getTransferFiles(); + if (StringUtils.isNotBlank(transferFiles)){ + String[] split = transferFiles.split(","); + for (String s : split) { + String urlPrefix = fileUploadComponent.getUrlPrefix(); + s = urlPrefix + s; + fpImages.add(s); + } + } + } + vo.setHgzImages(hgzImages); + vo.setFpImages(fpImages); + //银行卡 + List yhkVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType()); + List yhkImages = new ArrayList<>(); + if (yhkVos != null && yhkVos.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : yhkVos) { + yhkImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); + } + } + vo.setYhkImages(yhkImages); + //购置税发票 + List gzsfpVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.GZSFP.getAttachType()); + List gzsfpImages = new ArrayList<>(); + if (gzsfpVos != null && gzsfpVos.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : gzsfpVos) { + gzsfpImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); + } + } + vo.setGzsfpImages(gzsfpImages); + //保险发票 + List bxfpVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.BXFP.getAttachType()); + List bxfpImages = new ArrayList<>(); + if (bxfpVos != null && bxfpVos.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : bxfpVos) { + bxfpImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); + } + } + vo.setBxfpImages(bxfpImages); + //保单 + List bdVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.BD.getAttachType()); + List bdImages = new ArrayList<>(); + if (bdVos != null && bdVos.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : bdVos) { + bdImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); + } + } + vo.setBdImages(bdImages); + //融资合同 + List rzhtVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.RZHT.getAttachType()); + List rzhtImages = new ArrayList<>(); + if (rzhtVos != null && rzhtVos.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : rzhtVos) { + rzhtImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); + } + } + vo.setRzhtImages(rzhtImages); + //证明附件 + List zmfjVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.ZMFJ.getAttachType()); + List zmfjImages = new ArrayList<>(); + if (zmfjVos != null && zmfjVos.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : zmfjVos) { + zmfjImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); + } + } + vo.setZmfjImages(zmfjImages); + return vo; + } } \ No newline at end of file From f2089f07363b7e502768151bbf4f6d234837d15c Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 13 Sep 2023 13:46:22 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9E=8D?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=94=BF=E7=AD=96=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../financialpolicymanagementAdd.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue b/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue index 23903748ee..5151d0df24 100644 --- a/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue +++ b/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue @@ -18,7 +18,7 @@ -
*适用销售部门:
+
适用销售部门:
@@ -588,9 +588,6 @@ export default { } } this.formobj.useDeptList = aa - } else { - this.$message({ showClose: true, type: 'error', message: '适用销售部门不能为空' }) - return } if (this.formobj.vehTypeKeyList.length > 0) { const aa = [] From 800662f3da0447312dda530de085e3d9f0d0687a Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 13 Sep 2023 13:49:52 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B4=B7=E5=89=8D?= =?UTF-8?q?=E4=BF=A1=E7=94=A8=E5=AE=A1=E6=A0=B8=E7=94=B3=E8=AF=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xinyongshensuFlow/creditauditappealDaiBan.vue | 12 ++++++------ .../xinyongshensuFlow/creditauditappealYiBan.vue | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealDaiBan.vue index 748f2eb2f2..a0bd4e899c 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealDaiBan.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealDaiBan.vue @@ -64,7 +64,7 @@
身份证正反面
- + @@ -112,7 +112,7 @@
要求附件
- + @@ -120,7 +120,7 @@
查询结果截图
- + @@ -155,7 +155,7 @@
查询结果截图
- + @@ -215,7 +215,7 @@ - + @@ -225,7 +225,7 @@ - + diff --git a/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealYiBan.vue index f5971ace08..8437bbf5cf 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealYiBan.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealYiBan.vue @@ -62,7 +62,7 @@
身份证正反面
- + @@ -110,7 +110,7 @@
要求附件
- + @@ -118,7 +118,7 @@
查询结果截图
- + @@ -153,7 +153,7 @@
查询结果截图
- + @@ -213,7 +213,7 @@ - + @@ -223,7 +223,7 @@ - + From ce7a97c8b2bffa27fba26ca3cf04ff8f6a613608 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 13 Sep 2023 13:51:45 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanCreditAppealApplyMapper.java | 3 --- .../LoanCreditAppealApplyService.java | 6 +++--- .../LoanMortgageInformationTransactService.java | 16 ++++++++-------- .../LoanPreloanCreditApplyMapper.java | 3 +++ .../LoanPreloanCreditApplyService.java | 4 ++++ .../LoanRepaymentScheduleService.java | 4 ++-- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java index d02d3f81c6..4ae8ef43b1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java @@ -69,9 +69,6 @@ public interface LoanCreditAppealApplyMapper extends BaseMapper map); - @Update("update loan_credit_appeal_apply set ssjg=#{ssjg} where sid=#{creditApplySid}") - void updateSsjgBySid(String ssjg, String creditApplySid); - String selectNum(String billNo); LoanCreditAppealApply selectByApplySid(String sid); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java index 8aa39528a7..751a2b7285 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java @@ -457,7 +457,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); - baseMapper.updateSsjgBySid("不通过", loanCreditAppealApply.getCreditApplySid()); + loanPreloanCreditApplyService.updateSsjgBySid("不通过", loanCreditAppealApply.getCreditApplySid()); return rb.success().setData(resultBean.getData()); } else { if (businessTaskId.equals(query.getTaskId())) { @@ -619,7 +619,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); - baseMapper.updateSsjgBySid("不通过", loanCreditAppealApply.getCreditApplySid()); + loanPreloanCreditApplyService.updateSsjgBySid("不通过", loanCreditAppealApply.getCreditApplySid()); return rb.success().setData(resultBean.getData()); } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java index 9f88da5254..b58fd95a5a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java @@ -154,8 +154,8 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService selectBySid(String orderSid); + + @Update("update loan_preloan_credit_apply set ssjg=#{ssjg} where sid=#{creditApplySid}") + void updateSsjgBySid(@Param("ssjg") String ssjg,@Param("creditApplySid") String creditApplySid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java index fd4c467f48..978831f9ae 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java @@ -625,4 +625,8 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService Date: Wed, 13 Sep 2023 14:07:50 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../金融报价单打印模板/jrbjd.ftl | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/工作内容需要的文档/单据模板/金融报价单打印模板/jrbjd.ftl b/工作内容需要的文档/单据模板/金融报价单打印模板/jrbjd.ftl index 90823c64f0..0cc2a6b84c 100644 --- a/工作内容需要的文档/单据模板/金融报价单打印模板/jrbjd.ftl +++ b/工作内容需要的文档/单据模板/金融报价单打印模板/jrbjd.ftl @@ -2251,7 +2251,7 @@ - ${financProject!} + ${financProject!} @@ -2428,7 +2428,7 @@ - ${sfbl!} + ${sfbl!} @@ -2496,7 +2496,7 @@ - ${sfje!} + ${sfje!} @@ -2564,7 +2564,7 @@ - ${cpdkje!} + ${cpdkje!} @@ -2631,7 +2631,7 @@ - ${cpqs!} + ${cpqs!} @@ -2719,7 +2719,7 @@ - ${dkbzjbl!} + ${dkbzjbl!} @@ -2787,7 +2787,7 @@ - ${dkbzj!} + ${dkbzj!} @@ -2855,7 +2855,7 @@ - ${cjtx!} + ${cjtx!} @@ -2922,7 +2922,7 @@ - ${txyt!} + ${txyt!} @@ -3010,7 +3010,7 @@ - ${nll!} + ${nll!} @@ -3078,7 +3078,7 @@ - ${yhje!} + ${yhje!} @@ -3146,7 +3146,7 @@ - ${lxze!} + ${lxze!} @@ -3213,7 +3213,7 @@ - ${txdck!} + ${txdck!} @@ -3432,7 +3432,7 @@ - ${qtrdkje!} + ${qtrdkje!} @@ -3499,7 +3499,7 @@ - ${qtrqs!} + ${qtrqs!} @@ -3586,7 +3586,7 @@ - ${qtrnll!} + ${qtrnll!} @@ -3654,7 +3654,7 @@ - ${qtryhje!} + ${qtryhje!} From 7560151a6aea17914377a0e82544866f151dde8a Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 13 Sep 2023 14:13:44 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java index 6dc659750d..9dec707469 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java @@ -55,9 +55,9 @@ public class LoanFinPolicyService extends MybatisBaseService useDeptList = dto.getUseDeptList(); useDeptList.removeAll(Collections.singleton(null)); - if (useDeptList.isEmpty()) { + /*if (useDeptList.isEmpty()) { return rb.setMsg("适用销售部门不允许为空"); - } + }*/ if (StringUtils.isBlank(dto.getBankSid())) { return rb.setMsg("资方简称不允许为空"); } From 029ae1ddbb606c6d9fdc965e3e17c9cefbec0a25 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 13 Sep 2023 14:24:13 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E7=94=B3=E8=AF=B7--=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=92=8C=E4=B8=8B=E8=BD=BD=E9=87=91=E8=9E=8D=E6=8A=A5=E4=BB=B7?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/chukuguanli/chukubanli.js | 18 + .../chukuguanli/chukubanli/chukushenqing.vue | 16 +- .../relation/financialquotationsheet.vue | 372 ++++++++++++++++++ 3 files changed, 404 insertions(+), 2 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/financialquotationsheet.vue diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js b/anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js index 479bfe1321..b86e8ea588 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js @@ -186,6 +186,24 @@ export function deliveredFinSelecByBusVinSidPC(data) { }) } +// 查看金融报价单 +export function selectQuotation(data) { + return request({ + url: '/base/v1/basevehicleout/selectQuotation', + method: 'post', + params: data + }) +} + +// 下载金融报价单 +export function createjrbjdPdf(data) { + return request({ + url: '/base/v1/basevehicleout/createjrbjdPdf', + method: 'post', + params: data + }) +} + // 保存和修改接口 已改 export function saveOrUpdate(data) { return request({ diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue index ee49f09de8..2c8dba40a3 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue @@ -63,7 +63,8 @@ @@ -107,8 +108,13 @@ + + + + + @@ -124,6 +130,7 @@ import pageye from '@/components/pagination/pageye' import ButtonBar from '@/components/ButtonBar' import chukushenqingAdd from './chukushenqingAdd' import chukushenqingInfo from './chukushenqingInfo' +import financialquotationsheet from './relation/financialquotationsheet' export default { name: 'chukushenqing', @@ -132,7 +139,8 @@ export default { Pagination, pageye, chukushenqingAdd, - chukushenqingInfo + chukushenqingInfo, + financialquotationsheet }, data() { return { @@ -379,6 +387,10 @@ export default { this.viewState = 4 this.$refs['divInfo'].showInfo(row.sid) }, + lookQuotation(row) { + this.viewState = 5 + this.$refs['divJRBJD'].showInfo(row) + }, // 删除 doDel() { if (this.sids.length === 0) { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/financialquotationsheet.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/financialquotationsheet.vue new file mode 100644 index 0000000000..794230f04b --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/financialquotationsheet.vue @@ -0,0 +1,372 @@ + + + + + From 67a022f210b3a7abb4b216c851d5da09372a0240 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 13 Sep 2023 14:29:13 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9E=8D?= =?UTF-8?q?=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/publicPage/financialscheme.vue | 4 ++-- .../src/views/workflow/publicPage/financialscheme.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue index 94d3d0ee19..0924ac1435 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue @@ -435,7 +435,7 @@ export default { }) } if (this.finance.policySid !== '' && this.finance.isPack !== null) { - selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid }).then((res) => { + selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid, modelSid: this.modelSid }).then((res) => { if (res.success) { this.other_list = res.data } @@ -560,7 +560,7 @@ export default { this.finance.otherPolicyPeriod = '' this.finance.otherPolicyYearRatio = '' } - selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid }).then((res) => { + selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid, modelSid: this.modelSid }).then((res) => { if (res.success) { this.other_list = res.data } diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue index ff1b1b19e9..6a21b9e00c 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue @@ -430,7 +430,7 @@ export default { }) } if (this.finance.policySid !== '' && this.finance.isPack !== null) { - selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid }).then((res) => { + selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid, modelSid: this.modelSid }).then((res) => { if (res.success) { this.other_list = res.data } @@ -553,7 +553,7 @@ export default { this.finance.otherPolicyPeriod = '' this.finance.otherPolicyYearRatio = '' } - selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid }).then((res) => { + selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid, modelSid: this.modelSid }).then((res) => { if (res.success) { this.other_list = res.data } From 739e9a9399c071919ea8ea8a82a2883b08aa6cb0 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 13 Sep 2023 14:32:49 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9E=8D?= =?UTF-8?q?=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/publicPage/financialscheme.vue | 4 ++-- .../src/views/workFlow/publicPage/financialscheme.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue b/anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue index c7987da9ac..2911d3bff7 100644 --- a/anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue +++ b/anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue @@ -395,7 +395,7 @@ export default { }) } if (this.finance.policySid !== '' && this.finance.isPack !== null) { - selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid }).then((res) => { + selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid, modelSid: this.modelSid }).then((res) => { if (res.success) { this.other_list = res.data } @@ -520,7 +520,7 @@ export default { this.finance.otherPolicyPeriod = '' this.finance.otherPolicyYearRatio = '' } - selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid }).then((res) => { + selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid, modelSid: this.modelSid }).then((res) => { if (res.success) { this.other_list = res.data } diff --git a/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialscheme.vue b/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialscheme.vue index 310a7396be..06977b02eb 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialscheme.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialscheme.vue @@ -397,7 +397,7 @@ export default { }) } if (this.finance.policySid !== '' && this.finance.isPack !== null) { - selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid }).then((res) => { + selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid, modelSid: this.modelSid }).then((res) => { if (res.success) { this.other_list = res.data } @@ -522,7 +522,7 @@ export default { this.finance.otherPolicyPeriod = '' this.finance.otherPolicyYearRatio = '' } - selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid }).then((res) => { + selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid, modelSid: this.modelSid }).then((res) => { if (res.success) { this.other_list = res.data } From 62207f199644f8fc1cf0ad8436fd3ef4237640e7 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 13 Sep 2023 18:33:26 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicleout/BaseVehicleOutService.java | 156 +++++++++++++++++- .../BusDeliveredApplyDetailsFeign.java | 5 + ...BusDeliveredApplyDetailsFeignFallback.java | 5 + .../BusDeliveredApplyDetailsMapper.java | 2 + .../BusDeliveredApplyDetailsMapper.xml | 9 + .../BusDeliveredApplyDetailsRest.java | 5 + .../BusDeliveredApplyDetailsService.java | 8 + .../bussalesorder/BusSalesOrderService.java | 8 +- .../api/loanfileexamine/LoanFileDto.java | 64 +++++++ .../loanfileexamine/LoanFileexamineFeign.java | 5 + .../loanfileexamine/LoanFileexamineMapper.xml | 2 +- .../loanfileexamine/LoanFileexamineRest.java | 14 +- .../LoanFileexamineService.java | 57 ++++++- .../fileexamine/FileexamineDetailsVo.java | 73 ++++++++ .../api/risk/fileexamine/FileexamineDto.java | 64 +++++++ .../risk/fileexamine/FileexamineFeign.java | 76 +++++++++ .../fileexamine/FileexamineFeignFallback.java | 70 ++++++++ .../risk/fileexamine/FileexamineQuery.java | 58 +++++++ .../api/risk/fileexamine/FileexamineVo.java | 65 ++++++++ .../creditreview/CreditReviewService.java | 6 + .../biz/risk/fileexamine/FileexamineRest.java | 78 +++++++++ .../risk/fileexamine/FileexamineService.java | 107 ++++++++++++ 22 files changed, 918 insertions(+), 19 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineFeign.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineFeignFallback.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineVo.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineRest.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineService.java diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index a785e82dc6..f4b1ed229f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -2168,7 +2168,29 @@ public class BaseVehicleOutService extends MybatisBaseService filesList = new ArrayList<>(); + File xsckdFile = new File(docPdfComponent.getUploadTemplateUrl() + dateStr + "/" + pdfName); + filesList.add(xsckdFile); + //生成销售订单审批 + BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(baseVehicleOutApply.getContractNo()).getData(); + String xsddspUrl = busSalesOrderFeign.createPdf(busSalesOrder.getSid(), "").getData(); + xsddspUrl = xsddspUrl.replace("template/", ""); + File xsddspFile = new File(docPdfComponent.getUploadTemplateUrl() + xsddspUrl); + filesList.add(xsddspFile); + //生成金融报价单 + String cksqSid = busDeliveredApplyDetailsFeign.fetchByVehSid(baseVehicleOut1.getVinSid()).getData(); + if (StringUtils.isNotBlank(cksqSid)) { + String jrbjdUrl = createjrbjdPdfHB(cksqSid, baseVehicleOut1.getVinSid()); + File jrbjdFile = new File(docPdfComponent.getUploadTemplateUrl() + jrbjdUrl); + filesList.add(jrbjdFile); + } + String hbName = "销售出库单_金融报价单_销售订单审批" + ".pdf"; + try { + File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + dateStr + "/" + hbName); + } catch (Exception e) { + e.printStackTrace(); + } + pdfPath.setPdfPath("/template/" + dateStr + "/" + hbName); return pdfPath; } @@ -2420,7 +2442,11 @@ public class BaseVehicleOutService extends MybatisBaseService 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", baseVehicle.getVinNo()); + dataMap.put("mobile", baseQuotationVo.getMobile()); + dataMap.put("address", baseQuotationVo.getAddress()); + dataMap.put("affiliatedCompany", baseQuotationVo.getAffiliatedCompany()); + //车型及价格 + dataMap.put("modelName", baseQuotationVo.getModelName()); + //查询挂车信息 + List baseTrailerVos = baseTrailerService.fetchAllByVehSid(vehSid); + 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(baseVehicle.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()); + //金融方案 + if ("1".equals(baseJRFAVo.getIsPack())) { + dataMap.put("isPack", "是"); + } else { + dataMap.put("isPack", "否"); + } + 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, ""); + return dateStr + "/" + pdfName; + } } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeign.java index 7a0a0b9f16..aeea911c1d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeign.java @@ -85,4 +85,9 @@ public interface BusDeliveredApplyDetailsFeign { @PostMapping("/selectByApplySid") @ResponseBody ResultBean> selectByApplySid(@RequestParam("sid") String sid); + + @ApiOperation("查询出库申请单sid") + @PostMapping("/fetchByVehSid") + @ResponseBody + ResultBean fetchByVehSid(@RequestParam("vinSid") String vinSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeignFallback.java index 6b649a50a9..1c8e14f664 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeignFallback.java @@ -74,4 +74,9 @@ public class BusDeliveredApplyDetailsFeignFallback implements BusDeliveredApplyD public ResultBean> selectByApplySid(String sid) { return null; } + + @Override + public ResultBean fetchByVehSid(String vinSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java index 1804a7ff9a..fd02fb0d04 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java @@ -94,4 +94,6 @@ public interface BusDeliveredApplyDetailsMapper extends BaseMapper selectByApplySid(String outboundSid); List selectVinSidByApplySid(String sid); + + String fetchByVehSid(String vinSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml index a280872595..baee829351 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml @@ -75,4 +75,13 @@ left join bus_sales_order bo on bo.sid = bv.salesOrderSid where bd.applySid = #{sid} and bo.contractNo = ba.contractNo + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsRest.java index 10ee4121b9..921fc411dc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsRest.java @@ -97,4 +97,9 @@ public class BusDeliveredApplyDetailsRest implements BusDeliveredApplyDetailsFei List busDeliveredApplyDetails = busDeliveredApplyDetailsService.selectByApplySid(sid); return rb.success().setData(busDeliveredApplyDetails); } + + @Override + public ResultBean fetchByVehSid(String vinSid) { + return busDeliveredApplyDetailsService.fetchByVehSid(vinSid); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java index 29f12867dc..f7e7c48c20 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java @@ -46,9 +46,11 @@ import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessage import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import org.apache.poi.util.StringUtil; import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -214,4 +216,10 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService selectVinSidByApplySid(String sid) { return baseMapper.selectVinSidByApplySid(sid); } + + public ResultBean fetchByVehSid(String vinSid) { + ResultBean rb = ResultBean.fireFail(); + String cksqSid = baseMapper.fetchByVehSid(vinSid); + return rb.success().setData(cksqSid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 865253643a..945c42648b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -6541,7 +6541,7 @@ public class BusSalesOrderService extends MybatisBaseService flowRecordVo = flowableFeignPro.flowRecordAndComment(busSalesOrder.getProcInstId(), "1").getData(); List busSalesOrderSourceLCVos = new ArrayList<>(); - for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { + /*for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { if (flowTask.getFlowableRecordVo() != null) { Map flowableRecordVo = flowTask.getFlowableRecordVo(); BusSalesOrderSourceLCVo busSalesOrderSourceLCVo = new BusSalesOrderSourceLCVo(); @@ -6567,8 +6567,8 @@ public class BusSalesOrderService extends MybatisBaseService messages = messageFeign.selectByBusinessSid(busSalesOrder.getSid()).getData(); + }*/ + /*List messages = messageFeign.selectByBusinessSid(busSalesOrder.getSid()).getData(); if (messages.size() > 0) { for (Message message : messages) { BusSalesOrderSourceLCVo busSalesOrderSourceLCVo = new BusSalesOrderSourceLCVo(); @@ -6585,7 +6585,7 @@ public class BusSalesOrderService extends MybatisBaseService_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanfileexamine; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui-riskcenter(放款资料审核)
+ * File: LoanFileexamineDto.java
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDto
+ * Description: 放款资料审核 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-09-08 09:43:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "放款资料审核 数据传输对象", description = "放款资料审核 数据传输对象") +public class LoanFileDto implements Dto { + + private String sid; + + @ApiModelProperty("银行卡") + private List yhkImages = new ArrayList<>(); + @ApiModelProperty("购置税发票") + private List gzsfpImages = new ArrayList<>(); + @ApiModelProperty("保险发票") + private List bxfpImages = new ArrayList<>(); + @ApiModelProperty("保单") + private List bdImages = new ArrayList<>(); +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeign.java index a13b6b15c2..56da05fd71 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeign.java @@ -75,4 +75,9 @@ public interface LoanFileexamineFeign { @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("移动端上传附件") + @PostMapping("/uploadFile") + @ResponseBody + public ResultBean uploadFile(@RequestBody LoanFileDto loanFileDto); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml index 4d2fc6e9b5..a7b27bddb8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml @@ -10,7 +10,7 @@ bo.`orgName`, bo.`staffName`, lf.`bankStateValue`, - IF(lf.`zlState` = '0', '未齐全', '已齐全'), + IF(lf.`zlState` = 0, '未齐全', '已齐全') AS zlState, bl.`loanContractNo`, bl.`vehCount` AS num, bl.`borrowerName`, diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java index c48fa8f44b..bb0a94286c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.riskcenter.biz.loanfileexamine; +import com.yxt.anrui.riskcenter.api.loanfileexamine.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -34,12 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineQuery; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDetailsVo; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDto; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign; /** * Project: anrui-riskcenter(放款资料审核)
@@ -97,4 +92,11 @@ public class LoanFileexamineRest implements LoanFileexamineFeign { LoanFileexamineDetailsVo vo = loanFileexamineService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @Override + public ResultBean uploadFile(LoanFileDto loanFileDto) { + ResultBean rb = ResultBean.fireFail(); + loanFileexamineService.uploadFile(loanFileDto); + return rb.success(); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java index 9bb25ec551..72d090bbf1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java @@ -43,6 +43,7 @@ import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; +import com.yxt.anrui.riskcenter.api.loanfileexamine.*; import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo; @@ -56,11 +57,6 @@ import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineQuery; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDetailsVo; -import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -342,10 +338,10 @@ public class LoanFileexamineService extends MybatisBaseService busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSid(entity.getSaleOrderSid()).getData(); + vo.setNum(busSalesOrderVehicles.size()); String vinNos = ""; for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { vinNos = vinNos + busSalesOrderVehicle.getLinkNo() + ","; @@ -429,4 +425,53 @@ public class LoanFileexamineService extends MybatisBaseService yhkImages = loanFileDto.getYhkImages(); + List gzsfpImages = loanFileDto.getGzsfpImages(); + List bxfpImages = loanFileDto.getBxfpImages(); + List bdImages = loanFileDto.getBdImages(); + loanHomevisitInvestigateFileService.delByMainSid(sid); + 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); + } + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineDetailsVo.java new file mode 100644 index 0000000000..f416193875 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineDetailsVo.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.risk.fileexamine; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui-riskcenter(放款资料审核)
+ * File: LoanFileexamineVo.java
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo
+ * Description: 放款资料审核 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-09-08 09:43:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "放款资料审核 视图数据详情", description = "放款资料审核 视图数据详情") +public class FileexamineDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("消贷合同编号") + private String loanContractNo; + @ApiModelProperty("台数") + private Integer num; + @ApiModelProperty("贷款人名称") + private String borrowerName; + @ApiModelProperty("销售专员名称") + private String staffName; + @ApiModelProperty("车架号拼接") + private String vinNo; + @ApiModelProperty("银行卡") + private List yhkImages; + @ApiModelProperty("购置税发票") + private List gzsfpImages; + @ApiModelProperty("保险发票") + private List bxfpImages; + @ApiModelProperty("保单") + private List bdImages; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineDto.java new file mode 100644 index 0000000000..d31bfd0343 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineDto.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.risk.fileexamine; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui-riskcenter(放款资料审核)
+ * File: LoanFileexamineDto.java
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDto
+ * Description: 放款资料审核 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-09-08 09:43:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "放款资料审核 数据传输对象", description = "放款资料审核 数据传输对象") +public class FileexamineDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("银行卡") + private List yhkImages = new ArrayList<>(); + @ApiModelProperty("购置税发票") + private List gzsfpImages = new ArrayList<>(); + @ApiModelProperty("保险发票") + private List bxfpImages = new ArrayList<>(); + @ApiModelProperty("保单") + private List bdImages = new ArrayList<>(); +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineFeign.java new file mode 100644 index 0000000000..c93c5c1358 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineFeign.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.risk.fileexamine; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +/** + * Project: anrui-riskcenter(放款资料审核)
+ * File: LoanFileexamineFeign.java
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign
+ * Description: 放款资料审核.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-09-08 09:43:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "放款资料审核") +@FeignClient( + contextId = "terminal-Fileexamine", + name = "anrui-terminal", + path = "v1/loanfileexamine", + fallback = FileexamineFeignFallback.class) +public interface FileexamineFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody FileexamineDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineFeignFallback.java new file mode 100644 index 0000000000..5dec4b54f3 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineFeignFallback.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.risk.fileexamine; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +/** + * Project: anrui-riskcenter(放款资料审核)
+ * File: LoanFileexamineFeignFallback.java
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeignFallback
+ * Description: 放款资料审核.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-09-08 09:43:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class FileexamineFeignFallback implements FileexamineFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-riskcenter/loanfileexamine/listPage无法访问"); + } + + @Override + public ResultBean save(FileexamineDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanfileexamine/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanfileexamine/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-riskcenter/loanfileexamine/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineQuery.java new file mode 100644 index 0000000000..c8b809ba49 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineQuery.java @@ -0,0 +1,58 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.risk.fileexamine; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-riskcenter(放款资料审核)
+ * File: LoanFileexamineQuery.java
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineQuery
+ * Description: 放款资料审核 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-09-08 09:43:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "放款资料审核 查询条件", description = "放款资料审核 查询条件") +public class FileexamineQuery implements Query { + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织全路径") + private String orgPath; + private String menuSid; + private String type; + private String names; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineVo.java new file mode 100644 index 0000000000..8e22f9597e --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineVo.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.risk.fileexamine; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-riskcenter(放款资料审核)
+ * File: LoanFileexamineVo.java
+ * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo
+ * Description: 放款资料审核 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-09-08 09:43:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "放款资料审核 视图数据对象", description = "放款资料审核 视图数据对象") +public class FileexamineVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("消贷合同编号") + private String loanContractNo; + @ApiModelProperty("贷款人名称") + private String borrowerName; + @ApiModelProperty("台数") + private String num; + @ApiModelProperty("销售专员名称") + private String staffName; + @ApiModelProperty("资料状态") + private String zlState; + @ApiModelProperty("是否上传") + private Boolean isUpload = false; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java index b64767cc4e..92c8ea7e02 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java @@ -291,6 +291,12 @@ public class CreditReviewService { identityDetailsVo3.setDictKey("003"); identityDetailsVo3.setDictValue("暂无法判定"); managementResultDict.add(identityDetailsVo3); + IdentityDetailsVo identityDetailsVo4 = new IdentityDetailsVo(); + identityDetailsVo4.setSid("004"); + identityDetailsVo4.setDictKey("004"); + identityDetailsVo4.setDictValue("无需风控审核"); + companyResultDict.add(identityDetailsVo4); + managementResultDict.add(identityDetailsVo4); creditReviewDetailsoffVo.setCompanyResultDict(companyResultDict); creditReviewDetailsoffVo.setManagementResultDict(managementResultDict); return rb.success().setData(creditReviewDetailsoffVo); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineRest.java new file mode 100644 index 0000000000..43f61f6603 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineRest.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.risk.fileexamine; + +import com.yxt.anrui.riskcenter.api.loanfileexamine.*; +import com.yxt.anrui.terminal.api.risk.fileexamine.*; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * Project: anrui-riskcenter(放款资料审核)
+ * File: LoanFileexamineFeignFallback.java
+ * Class: com.yxt.anrui.riskcenter.biz.loanfileexamine.LoanFileexamineRest
+ * Description: 放款资料审核.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-09-08 09:43:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "放款资料审核") +@RestController +@RequestMapping("v1/loanfileexamine") +public class FileexamineRest implements FileexamineFeign { + + @Autowired + private FileexamineService fileexamineService; + + @Override + public ResultBean> listPage(PagerQuery pq) { + return fileexamineService.listPage(pq); + } + + @Override + public ResultBean save(FileexamineDto dto) { + return fileexamineService.save(dto); + } + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return fileexamineService.fetchDetailsBySid(sid); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineService.java new file mode 100644 index 0000000000..fb042621d5 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineService.java @@ -0,0 +1,107 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.risk.fileexamine; + +import com.yxt.anrui.riskcenter.api.loanfileexamine.*; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDto; +import com.yxt.anrui.terminal.api.risk.fileexamine.FileexamineDetailsVo; +import com.yxt.anrui.terminal.api.risk.fileexamine.FileexamineDto; +import com.yxt.anrui.terminal.api.risk.fileexamine.FileexamineQuery; +import com.yxt.anrui.terminal.api.risk.fileexamine.FileexamineVo; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class FileexamineService { + + @Autowired + private LoanFileexamineFeign loanFileexamineFeign; + + public ResultBean> listPage(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerQuery pq = new PagerQuery<>(); + FileexamineQuery params = pagerQuery.getParams(); + LoanFileexamineQuery params1 = new LoanFileexamineQuery(); + params1.setOrgSidPath(params.getOrgPath()); + params1.setUserSid(params.getUserSid()); + params1.setNames(params.getNames()); + params1.setType(params.getType()); + pq.setParams(params1); + ResultBean> resultBean = loanFileexamineFeign.listPage(pq); + List fileexamineVos = new ArrayList<>(); + PagerVo v = new PagerVo<>(); + List records = resultBean.getData().getRecords(); + for (LoanFileexamineVo record : records) { + FileexamineVo fileexamineVo = new FileexamineVo(); + fileexamineVo.setSid(record.getSid()); + fileexamineVo.setLoanContractNo(record.getLoanContractNo()); + fileexamineVo.setZlState(record.getZlState()); + fileexamineVo.setBorrowerName(record.getBorrowerName()); + fileexamineVo.setNum(record.getNum()); + fileexamineVo.setStaffName(record.getUseOrgName() + "-" + record.getOrgName() + "-" + record.getStaffName()); + if ("未齐全".equals(record.getZlState())) { + fileexamineVo.setIsUpload(true); + } + fileexamineVos.add(fileexamineVo); + } + v.setRecords(fileexamineVos); + return rb.success().setData(v); + } + + public ResultBean fetchDetailsBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + FileexamineDetailsVo fileexamineDetailsVo = new FileexamineDetailsVo(); + LoanFileexamineDetailsVo data = loanFileexamineFeign.fetchDetailsBySid(sid).getData(); + fileexamineDetailsVo.setLoanContractNo(data.getLoanContractNo()); + fileexamineDetailsVo.setNum(data.getNum()); + fileexamineDetailsVo.setStaffName(data.getStaffName()); + fileexamineDetailsVo.setVinNo(data.getVinNo()); + fileexamineDetailsVo.setYhkImages(data.getYhkImages()); + fileexamineDetailsVo.setGzsfpImages(data.getGzsfpImages()); + fileexamineDetailsVo.setBxfpImages(data.getBxfpImages()); + fileexamineDetailsVo.setBdImages(data.getBdImages()); + return rb.success().setData(fileexamineDetailsVo); + } + + public ResultBean save(FileexamineDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanFileDto loanFileDto = new LoanFileDto(); + loanFileDto.setSid(dto.getSid()); + loanFileDto.setYhkImages(dto.getYhkImages()); + loanFileDto.setGzsfpImages(dto.getGzsfpImages()); + loanFileDto.setBxfpImages(dto.getBxfpImages()); + loanFileDto.setBdImages(dto.getBdImages()); + loanFileexamineFeign.uploadFile(loanFileDto); + return rb.success(); + } +} \ No newline at end of file From f76e2c78d1ab0463cdcba47a618dc6d2a5c9b3a7 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 13 Sep 2023 18:39:17 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E8=B4=B7=E6=AC=BE?= =?UTF-8?q?=E4=BA=BA=E5=88=97=E8=A1=A8=E5=8F=8A=E8=B7=B3=E8=BD=AC=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../saleOrders/AppBusSalesOrderFeign.java | 10 +++- .../AppBusSalesOrderFeignFallback.java | 5 ++ .../saleOrders/LoanPreloansQuery.java | 29 ++++++++++ .../saleOrders/LoanPreloansVo.java | 40 +++++++++++++ .../terminal/api/base/common/CommonFeign.java | 10 ++++ .../saleOrders/AppBusSalesOrderRest.java | 11 +++- .../saleOrders/AppBusSalesOrderService.java | 34 ++++++++++- .../terminal/biz/base/common/CommonRest.java | 10 ++++ .../biz/base/common/CommonService.java | 57 +++++++++++++++++++ 9 files changed, 198 insertions(+), 8 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LoanPreloansQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LoanPreloansVo.java diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java index 319792c3ed..81c87e7aa7 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java @@ -338,16 +338,20 @@ public interface AppBusSalesOrderFeign { @ApiOperation("保存销售订单贷款人数量") @PostMapping("/save/saleOrderInputLenderNum/{sid}/{num}") @ResponseBody - ResultBean saleOrderInputLenderNum(@PathVariable("sid") String sid,@PathVariable("num")String num); + ResultBean saleOrderInputLenderNum(@PathVariable("sid") String sid, @PathVariable("num") String num); @ApiOperation("保存销售订单贷款人自己") @PostMapping("/save/saleOrderInputLenderOwn/{saleOrderSid}") @ResponseBody - ResultBean saleOrderInputLenderOwn(@PathVariable("saleOrderSid")String saleOrderSid); + ResultBean saleOrderInputLenderOwn(@PathVariable("saleOrderSid") String saleOrderSid); @ApiOperation("保存销售订单贷款人") @PostMapping("/save/saleOrderInputLender/{saleOrderSid}/{sid}") @ResponseBody - ResultBean saleOrderInputLender(@PathVariable("saleOrderSid")String saleOrderSid,@PathVariable("sid")String sid); + ResultBean saleOrderInputLender(@PathVariable("saleOrderSid") String saleOrderSid, @PathVariable("sid") String sid); + @ApiOperation("确定贷款人分页列表") + @PostMapping("/getPreLoanList") + @ResponseBody + ResultBean> getPreLoanList(@RequestBody PagerQuery pagerQuery); } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java index e473aa4ecb..0d95e37add 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java @@ -315,4 +315,9 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign { public ResultBean saleOrderInputLender(String saleOrderSid, String sid) { return null; } + + @Override + public ResultBean> getPreLoanList(PagerQuery pagerQuery) { + return null; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LoanPreloansQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LoanPreloansQuery.java new file mode 100644 index 0000000000..fcbcf0aaa2 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LoanPreloansQuery.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/13 + **/ +@Data +public class LoanPreloansQuery implements Query { + private static final long serialVersionUID = 4677306476460284056L; + + @ApiModelProperty("姓名") + private String custName; + @ApiModelProperty("身份证号码") + private String idCard; + @ApiModelProperty("手机号码") + private String phone; + @ApiModelProperty("用户sid,即销售专员的用户sid") + private String userSid; + + @ApiModelProperty("移动端：姓名、身份证、手机号") + private String name; + @ApiModelProperty("销售订单sid") + private String orderSid; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LoanPreloansVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LoanPreloansVo.java new file mode 100644 index 0000000000..afa7447573 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LoanPreloansVo.java @@ -0,0 +1,40 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders; + +import com.yxt.anrui.terminal.api.base.common.CarModelVo; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/13 + **/ +@Data +public class LoanPreloansVo implements Vo { + private static final long serialVersionUID = -6577382635622047300L; + + @ApiModelProperty("客户sid") + private String custSid; + @ApiModelProperty("客户名称") + private String custName; + @ApiModelProperty("手机号码") + private String phone; + + @ApiModelProperty("公司风控结果") + private String gsfkjg; + @ApiModelProperty("资方名称") + private String capitalName; + @ApiModelProperty("资方风控结果") + private String zffkjg; + @ApiModelProperty("担保人") + private String peoName; + @ApiModelProperty("申请日期") + private String createTime; + + private String sid; + + @ApiModelProperty("页面地址") + private CarModelVo pluginPage; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java index cc317a0dc1..32890bf777 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java @@ -68,4 +68,14 @@ public interface CommonFeign { @GetMapping("/getLoanSs") ResultBean getLoanSs(@RequestParam("orderSid") String orderSid); + + @ApiOperation(value = "信用审核新增页面") + @ResponseBody + @GetMapping("/getInsertPreloan") + ResultBean getInsertPreloan(@RequestParam("customerTypeKey") String customerTypeKey,@RequestParam("customerTypeValue")String customerTypeValue); + + @ApiOperation(value = "信用审核详情页面") + @ResponseBody + @GetMapping("/getDetailsPreloan") + ResultBean getDetailsPreloan(@RequestParam("sid") String sid); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java index 75abf8c68a..d025bc4552 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java @@ -25,9 +25,9 @@ *********************************************************/ package com.yxt.anrui.terminal.biz.autoservice.saleOrders; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.AppBusSalesOrderFeign; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.InputLenderVo; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.OrderLoanVo; +import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanQuery; +import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.*; import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoQuery; import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoVo; @@ -409,4 +409,9 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign { return appBusSalesOrderService.saleOrderInputLender(saleOrderSid,sid); } + @Override + public ResultBean> getPreLoanList(PagerQuery pagerQuery) { + return appBusSalesOrderService.getPreLoanList(pagerQuery); + } + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index 6219f02ff7..0e8adf84e6 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -27,6 +27,8 @@ package com.yxt.anrui.terminal.biz.autoservice.saleOrders; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; +import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanQuery; +import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanVo; import com.yxt.anrui.base.api.basepurchasesystem.AppBasePurchSystemVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; @@ -71,13 +73,19 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceV import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery; import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo; import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandFeign; +import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo; +import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanOrderPreloanVo; import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyFeign; +import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanQuery; +import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.InputLenderVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.LoanPreloansQuery; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.LoanPreloansVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.OrderLoanVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.*; import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.FlowOrderVo; @@ -168,6 +176,8 @@ public class AppBusSalesOrderService { private LoanPreloanCreditApplyFeign loanPreloanCreditApplyFeign; @Autowired private CommonService commonService; + @Autowired + private AppSubsetVersionFeign appSubsetVersionFeign; /************************************* 销售订单接口 *********************************************/ @@ -767,7 +777,7 @@ public class AppBusSalesOrderService { } public ResultBean saleOrderInputLenderNum(String sid, String num) { - return busSalesOrderFeign.saveBorrowNum(sid,num); + return busSalesOrderFeign.saveBorrowNum(sid, num); } public ResultBean saleOrderInputLenderOwn(String saleOrderSid) { @@ -777,9 +787,29 @@ public class AppBusSalesOrderService { public ResultBean saleOrderInputLender(String saleOrderSid, String sid) { ResultBean rb = ResultBean.fireFail(); InputLenderVo inputLenderVo = new InputLenderVo(); - ResultBean resultBean = busSalesOrderFeign.saveSaleOrderInputLender(saleOrderSid,sid); + ResultBean resultBean = busSalesOrderFeign.saveSaleOrderInputLender(saleOrderSid, sid); SalesLenderVo vinVo = resultBean.getData(); BeanUtil.copyProperties(vinVo, inputLenderVo); return rb.success().setData(inputLenderVo); } + + public ResultBean> getPreLoanList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); + ResultBean> resultBean = loanPreloanCreditApplyFeign.getOrderLoanPagerList(pq); + List voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanPreloansVo.class)).collect(Collectors.toList()); + PagerVo v = new PagerVo<>(); + BeanUtil.copyProperties(resultBean.getData(), v); + String appSid = "fec4e243-491a-11ec-94cd-fa163e0cb33c"; + String moduleAction = "com.anrui.android.plugin.riskcontrol.activity.DetailCreditReviewActivity"; + ResultBean voResultBean = appSubsetVersionFeign.getLastRiskByAppSid(appSid, moduleAction); + AppSubVersionVo appSubVersionVo = voResultBean.getData(); + for (int i = 0; i < voList.size(); i++) { + LoanPreloansVo loanPreloansVo = voList.get(i); + CarModelVo finPage1 = commonService.getDetailsPreloan(loanPreloansVo.getSid(), appSubVersionVo).getData(); + loanPreloansVo.setPluginPage(finPage1); + } + v.setRecords(voList); + return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java index 0d894b5d8b..610277a0f3 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java @@ -68,4 +68,14 @@ public class CommonRest implements CommonFeign { public ResultBean getLoanSs(String orderSid) { return commonService.getLoanSs(orderSid); } + + @Override + public ResultBean getInsertPreloan(String customerTypeKey, String customerTypeValue) { + return commonService.getInsertPreloan(customerTypeKey,customerTypeValue); + } + + @Override + public ResultBean getDetailsPreloan(String sid) { + return commonService.getDetailsPreloan(sid,null); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java index ab6189cc14..10532d3f46 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java @@ -199,4 +199,61 @@ public class CommonService { carModelVo.setARouterParamValue(aRouterParamValue); return rb.success().setData(carModelVo); } + + public ResultBean getInsertPreloan(String customerTypeKey, String customerTypeValue) { + ResultBean rb = ResultBean.fireFail(); + String appSid = "fec4e243-491a-11ec-94cd-fa163e0cb33c"; + String moduleAction = "com.anrui.android.plugin.riskcontrol.activity.EditCreditReviewActivity"; + ResultBean voResultBean = appSubsetVersionFeign.getLastRiskByAppSid(appSid, moduleAction); + AppSubVersionVo appSubVersionVo = voResultBean.getData(); + CarModelVo carModelVo = new CarModelVo(); + Map map = new HashMap<>(); + map.put("creditType", 0); + map.put("createSource", 0); + map.put("customerTypeKey", customerTypeKey); + map.put("customerTypeValue", customerTypeValue); + appSubVersionVo.setJson(JSONObject.toJSONString(map)); + BeanUtil.copyProperties(appSubVersionVo, carModelVo); + carModelVo.setRequestCode("1004"); + carModelVo.setARouterClass("com.anrui.android.plugin.riskcontrol.manager.ARouterManager"); + carModelVo.setARouterMethod("EDIT_CREDIT_REVIEW_ACTIVITY"); + List aRouterParamType = new ArrayList<>(); + aRouterParamType.add("INT"); + aRouterParamType.add("INT"); + aRouterParamType.add("STRING"); + aRouterParamType.add("STRING"); + List aRouterParamValue = new ArrayList<>(); + aRouterParamValue.add("0"); + aRouterParamValue.add("0"); + aRouterParamValue.add(customerTypeKey); + aRouterParamValue.add(customerTypeValue); + carModelVo.setARouterParamType(aRouterParamType); + carModelVo.setARouterParamValue(aRouterParamValue); + return rb.success().setData(carModelVo); + } + + public ResultBean getDetailsPreloan(String sid,AppSubVersionVo appSubVersionVo) { + ResultBean rb = ResultBean.fireFail(); + if(appSubVersionVo != null){ + String appSid = "fec4e243-491a-11ec-94cd-fa163e0cb33c"; + String moduleAction = "com.anrui.android.plugin.riskcontrol.activity.DetailCreditReviewActivity"; + ResultBean voResultBean = appSubsetVersionFeign.getLastRiskByAppSid(appSid, moduleAction); + appSubVersionVo = voResultBean.getData(); + } + CarModelVo carModelVo = new CarModelVo(); + Map map = new HashMap<>(); + map.put("sid", sid); + appSubVersionVo.setJson(JSONObject.toJSONString(map)); + BeanUtil.copyProperties(appSubVersionVo, carModelVo); + carModelVo.setRequestCode("1006"); + carModelVo.setARouterClass("com.anrui.android.plugin.riskcontrol.manager.ARouterManager"); + carModelVo.setARouterMethod("DETAIL_CREDIT_REVIEW_ACTIVITY"); + List aRouterParamType = new ArrayList<>(); + aRouterParamType.add("STRING"); + List aRouterParamValue = new ArrayList<>(); + aRouterParamValue.add(sid); + carModelVo.setARouterParamType(aRouterParamType); + carModelVo.setARouterParamValue(aRouterParamValue); + return rb.success().setData(carModelVo); + } }