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] =?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("资方名称")