From 2de6fbc40ad1d69aa2ac17f790ab86075ab27d2b Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 21 Feb 2024 14:15:31 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/loanfundday/ScheduledLoanFundDayService.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/ScheduledLoanFundDayService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/ScheduledLoanFundDayService.java index b1ed7fa9f0..93d1436a36 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/ScheduledLoanFundDayService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/ScheduledLoanFundDayService.java @@ -46,11 +46,15 @@ public class ScheduledLoanFundDayService { List list = loanRepaymentPlanDetailsService.planList(); list.removeAll(Collections.singleton(null)); if (list.size() > 0) { - //截止到当天垫款余额T - BigDecimal paymentMoneyAll = list.stream().map(LoanRepaymentPlanDetails::getPaymentMoney).reduce(BigDecimal.ZERO, BigDecimal::add); - //当天资金占用费B - BigDecimal fundDay = paymentMoneyAll.multiply(new BigDecimal(7)).divide(new BigDecimal(10000), BigDecimal.ROUND_CEILING); +// //截止到当天垫款余额T +// BigDecimal paymentMoneyAll = list.stream().map(LoanRepaymentPlanDetails::getPaymentMoney).reduce(BigDecimal.ZERO, BigDecimal::add); +// //当天资金占用费B +// BigDecimal fundDay = paymentMoneyAll.multiply(new BigDecimal(7)).divide(new BigDecimal(10000), BigDecimal.ROUND_CEILING); for (int i = 0; i < list.size(); i++) { + //截止到当天垫款余额T + BigDecimal paymentMoneyAll = list.get(i).getPaymentMoney(); + //当天资金占用费B + BigDecimal fundDay = paymentMoneyAll.multiply(new BigDecimal(7)).divide(new BigDecimal(10000), BigDecimal.ROUND_CEILING); LoanRepaymentPlanDetails loanRepaymentPlanDetails = list.get(i); LoanFundDay loanFundDay = new LoanFundDay(); loanFundDay.setBusSid(loanRepaymentPlanDetails.getSid()); From bbe0320c7f0ee654e931582783faeafa8c6c5663 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 21 Feb 2024 14:24:07 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commoncontract/CommonContractMapper.java | 5 + .../commoncontract/CommonContractMapper.xml | 8 + .../commoncontract/CommonContractService.java | 317 +- .../src/main/resources/ftl/carContract.ftl | 1541 +++++++++ .../resources/ftl/dai_existingvehicles.ftl | 2879 +++++++++++++++++ .../main/resources/ftl/existingvehicles.ftl | 33 +- 6 files changed, 4692 insertions(+), 91 deletions(-) create mode 100644 anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl create mode 100644 anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java index 1af449efa2..239ec2280b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.base.api.commoncontract.*; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp; import org.apache.ibatis.annotations.*; import java.util.List; @@ -111,4 +112,8 @@ public interface CommonContractMapper extends BaseMapper { BusSalesOrder selectByBusSids(String busSid); CommonContract selectByBusSidss(String busSid); + + CrmCustomerTemp selectByCustomerSid(String affiliatedCompanySid); + + List selectByOrderSid(String busSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml index 074cbfbae8..10ed7f5fdd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml @@ -279,4 +279,12 @@ + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 53a3e169a7..cf3b51daaf 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -72,6 +72,8 @@ import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.config.DictCommonType; +import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateFeign; import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateQuotationQuery; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; @@ -202,6 +204,8 @@ public class CommonContractService extends MybatisBaseService createQueryWrapper(CommonContractQuery query) { @@ -836,24 +840,32 @@ public class CommonContractService extends MybatisBaseService invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid()); - if (invoicingDetailsVoResultBean.getData() != null) { - map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); + if (StringUtils.isNotBlank(dto.getCreateOrgName())) { + map.put("createOrgName", dto.getCreateOrgName()); + } else { + if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) { + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid()); + if (invoicingDetailsVoResultBean.getData() != null) { + map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); + } } } - if ("现车".equals(appOrderDetailsVo.getOrderType())) { + if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) { //获取模板 ftl = "existingvehicles"; if (stringList.size() > 0) { @@ -942,20 +954,32 @@ public class CommonContractService extends MybatisBaseService invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid()); - if (invoicingDetailsVoResultBean.getData() != null) { - map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); + if (StringUtils.isNotBlank(dto.getCreateOrgName())) { + map.put("createOrgName", dto.getCreateOrgName()); + } else { + if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) { + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid()); + if (invoicingDetailsVoResultBean.getData() != null) { + map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); + } } } - if ("现车".equals(appOrderDetailsVo.getOrderType())) { + if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) { //获取模板 ftl = "existingvehicles"; if (stringList.size() > 0) { @@ -1016,16 +1040,56 @@ public class CommonContractService extends MybatisBaseService dateString = Arrays.asList(date.split("-")); + String year = dateString.get(0); + String month = dateString.get(1); + String day = dateString.get(2); + map.put("year", year); + map.put("month", month); + map.put("day", day); + } + BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid()); + if (busSalesOrder.getAffiliatedCompanyType() == 0) { + //根据挂靠公司sid查询信息 + if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) { + BaseDistributor baseDistributor = baseDistributorService.fetchBySid(busSalesOrder.getAffiliatedCompanySid()); + if (baseDistributor != null) { + map.put("invoiceName", baseDistributor.getDisName());//开票名称 + map.put("customerName", baseDistributor.getDisName());//开票名称 + map.put("invoiceNo", baseDistributor.getRegistNum());//纳税人识别号 + map.put("idNo", baseDistributor.getRegistNum());//纳税人识别号 + map.put("adds", baseDistributor.getRegistDetailAddress());//户籍地址 + } + } + map.put("invoiceType", busSalesOrder.getBillingType());//开票类型 + } else { + if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) { + CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerSid(busSalesOrder.getAffiliatedCompanySid()); + if (crmCustomerTemp != null) { + map.put("invoiceName", crmCustomerTemp.getName());//开票名称 + map.put("customerName", crmCustomerTemp.getName());//开票名称 + map.put("invoiceNo", crmCustomerTemp.getIDNumber());//纳税人识别号 + map.put("idNo", crmCustomerTemp.getIDNumber());//纳税人识别号 + map.put("adds", crmCustomerTemp.getCertificateAddress());//户籍地址 + } + } + map.put("invoiceType", busSalesOrder.getBillingType());//开票类型 + } + map.put("createOrgName", ""); // 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用） if ("1".equals(dto.getDiscountKey())) { // 现车 - if ("现车".equals(appOrderDetailsVo.getOrderType())) { + if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) { //获取模板 ftl = "existingvehicles_black"; AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); List stringList = orderModelInfoVo.getOrderVinList(); if (stringList.size() > 0) { - remarks = "数量" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList); +// remarks = "数量" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList); + remarks = "数量" + num + "台，单台成交价： 元。"; } else { remarks = "数量" + num + "台，单台成交价： 元。"; } @@ -1036,7 +1100,7 @@ public class CommonContractService extends MybatisBaseService dateString = Arrays.asList(date.split("-")); + String year = dateString.get(0); + String month = dateString.get(1); + String day = dateString.get(2); + map.put("year", year); + map.put("month", month); + map.put("day", day); + } + BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid()); + if (busSalesOrder.getAffiliatedCompanyType() == 0) { + //根据挂靠公司sid查询信息 + if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) { + BaseDistributor baseDistributor = baseDistributorService.fetchBySid(busSalesOrder.getAffiliatedCompanySid()); + if (baseDistributor != null) { + map.put("invoiceName", baseDistributor.getDisName());//开票名称 + map.put("customerName", baseDistributor.getDisName());//开票名称 + map.put("invoiceNo", baseDistributor.getRegistNum());//纳税人识别号 + map.put("idNo", baseDistributor.getRegistNum());//纳税人识别号 + map.put("adds", baseDistributor.getRegistDetailAddress());//户籍地址 + } + } + map.put("invoiceType", busSalesOrder.getBillingType());//开票类型 + } else { + if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) { + CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerSid(busSalesOrder.getAffiliatedCompanySid()); + if (crmCustomerTemp != null) { + map.put("invoiceName", crmCustomerTemp.getName());//开票名称 + map.put("customerName", crmCustomerTemp.getName());//开票名称 + map.put("invoiceNo", crmCustomerTemp.getIDNumber());//纳税人识别号 + map.put("idNo", crmCustomerTemp.getIDNumber());//纳税人识别号 + map.put("adds", crmCustomerTemp.getCertificateAddress());//户籍地址 + } + } + map.put("invoiceType", busSalesOrder.getBillingType());//开票类型 + } + map.put("createOrgName", ""); // 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用） if ("1".equals(dto.getDiscountKey())) { // 现车 - if ("现车".equals(appOrderDetailsVo.getOrderType())) { + if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) { //获取模板 - ftl = "existingvehicles_black2"; + ftl = "existingvehicles_black"; AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); List stringList = orderModelInfoVo.getOrderVinList(); if (stringList.size() > 0) { - remarks = "数量" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList); +// remarks = "数量" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList); + remarks = "数量" + num + "台，单台成交价： 元。"; } else { remarks = "数量" + num + "台，单台成交价： 元。"; } @@ -1086,7 +1190,7 @@ public class CommonContractService extends MybatisBaseService map, AppOrderDetailsVo appOrderDetailsVo) { + private String getReceiveCar(PrintConfirmDto dto, Map map, AppOrderDetailsVo appOrderDetailsVo) { String url = ""; //查询销售订单的现车 AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); - List stringList = orderModelInfoVo.getVinList(); - /*if (stringList.size() > 0) { - map.put("vinNo", String.join(",", stringList)); - }*/ + ResultBean crmResultBean = crmCustomerTempFeign.fetchSid(appOrderDetailsVo.getCustomerSid()); + CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData(); + String idNo = crmCustomerTempVo.getIDNumber(); + map.put("customerName", appOrderDetailsVo.getName()); + map.put("idNo", idNo); + if (StringUtils.isNotBlank(dto.getCreateOrgName())) { + map.put("createOrgName", dto.getCreateOrgName()); + } else { + if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) { + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid()); + if (invoicingDetailsVoResultBean.getData() != null) { + map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); + } + } + } String ftl = "receiveCar"; - InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl2/" + ftl + ".ftl"); + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); //生成word文件名 String targetPath = docPdfComponent.getUploadTemplateUrl(); String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); @@ -1237,10 +1352,39 @@ public class CommonContractService extends MybatisBaseService map, AppOrderDetailsVo appOrderDetailsVo) { String url = ""; -// map.put("createDate", DateUtil.today()); + BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid()); + if (busSalesOrder != null) { + map.put("Yf", busSalesOrder.getCustomerName()); + if (busSalesOrder.getAffiliatedCompanyType() == 0) { + //根据挂靠公司sid查询信息 + if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) { + BaseDistributor baseDistributor = baseDistributorService.fetchBySid(busSalesOrder.getAffiliatedCompanySid()); + if (baseDistributor != null) { + map.put("invoiceName", baseDistributor.getDisName());//开票名称 + } + } + } + } + map.put("contractNo", "D" + map.get("contractNo")); + if (StringUtils.isNotBlank(dto.getCreateOrgName())) { + map.put("createOrgName", dto.getCreateOrgName()); + } else { + if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) { + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid()); + if (invoicingDetailsVoResultBean.getData() != null) { + map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); + } + } + } + CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid()); + if (commonContract != null) { + String date = DateUtil.format(commonContract.getCreateTime(), "yyyy-MM-dd"); + map.put("date", date); + } List carContractListVos = new ArrayList<>(); if (dto != null) { - List salesOrderVehicles = dto.getSalesOrderVehicles(); + List salesOrderVehicles = baseMapper.selectByOrderSid(dto.getBusSid()); + salesOrderVehicles.removeAll(Collections.singleton(null)); for (SalesOrderVehicle salesOrderVehicle : salesOrderVehicles) { CarContractListVo carContractListVo = new CarContractListVo(); BaseVehicle baseVehicle = baseVehicleService.fetchBySid(salesOrderVehicle.getLinkSid()); @@ -1263,7 +1407,7 @@ public class CommonContractService extends MybatisBaseService crmResultBean = crmCustomerTempFeign.fetchSid(sid); - if (!crmResultBean.getSuccess()) { - return rb.setMsg(crmResultBean.getMsg()); - } - CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData(); - String idNo = crmCustomerTempVo.getIDNumber(); + //查询销售订单的车型信息 AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo(); //根据车型sid查询车型的全称 @@ -2194,7 +2333,7 @@ public class CommonContractService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); - - Future future1 = pool.submit(() -> { - return genCarSaleContract(dto, map, appOrderDetailsVo); - }); - Future future1_2 = pool.submit(() -> { - return genCarSaleContract2(dto, map, appOrderDetailsVo); - }); - /*Future future2 = pool.submit(() -> { - return genCarSaleContractBlank(dto, map, appOrderDetailsVo); - }); - Future future2_2 = pool.submit(() -> { - return genCarSaleContractBlank2(dto, map, appOrderDetailsVo); - }); - //接收车辆委托书 - Future future4 = pool.submit(() -> { - return getReceiveCar(map, appOrderDetailsVo); - }); - String singleFinalPriceOne = priceInfo.getSingleFinalPrice(); - String depositOne = depositInfo.getDeposit(); - Future future8 = null; - if (!"02".equals(appOrderDetailsVo.getInvoiceType())) { - future8 = pool.submit(() -> { - return getCarContract(null, map, appOrderDetailsVo); - }); - }*/ + BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid()); List filesList = new ArrayList<>(); - if (future1 != null) { + if ("1".equals(busSalesOrder.getPayTypeKey())) {//全款 + Future future1 = pool.submit(() -> { + return genCarSaleContract(dto, map, appOrderDetailsVo); + }); + Future future1_2 = pool.submit(() -> { + return genCarSaleContract2(dto, map, appOrderDetailsVo); + }); + Future future2 = pool.submit(() -> { + return genCarSaleContractBlank(dto, map, appOrderDetailsVo); + }); + Future future2_2 = pool.submit(() -> { + return genCarSaleContractBlank2(dto, map, appOrderDetailsVo); + }); + //接收车辆委托书 + Future future4 = pool.submit(() -> { + return getReceiveCar(dto, map, appOrderDetailsVo); + }); + Future future8 = null; + if ("0".equals(dto.getDiscountKey())) { + if (busSalesOrder.getAffiliatedCompanyType() == 0) { + future8 = pool.submit(() -> { + return getCarContract(dto, map, appOrderDetailsVo); + }); + } + } if (StringUtils.isNotBlank(future1.get())) { File file = new File(docPdfComponent.getUploadTemplateUrl() + future1.get()); filesList.add(file); } - } - if (future1_2 != null) { if (StringUtils.isNotBlank(future1_2.get())) { File file = new File(docPdfComponent.getUploadTemplateUrl() + future1_2.get()); filesList.add(file); } - } - /*if (future2 != null) { if (StringUtils.isNotBlank(future2.get())) { File file = new File(docPdfComponent.getUploadTemplateUrl() + future2.get()); filesList.add(file); } - } - if (future2_2 != null) { if (StringUtils.isNotBlank(future2_2.get())) { File file = new File(docPdfComponent.getUploadTemplateUrl() + future2_2.get()); filesList.add(file); } - } - //合并pdf文件 - if (future8 != null) { - if (StringUtils.isNotBlank(future8.get())) { - File file = new File(docPdfComponent.getUploadTemplateUrl() + future8.get()); + if (StringUtils.isNotBlank(future4.get())) { + File file = new File(docPdfComponent.getUploadTemplateUrl() + future4.get()); filesList.add(file); } - } - if (StringUtils.isNotBlank(future4.get())) { - File file = new File(docPdfComponent.getUploadTemplateUrl() + future4.get()); - filesList.add(file); - }*/ + //合并pdf文件 + if (future8 != null) { + if (StringUtils.isNotBlank(future8.get())) { + File file = new File(docPdfComponent.getUploadTemplateUrl() + future8.get()); + filesList.add(file); + } + } + } else {//贷款 + SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(dto.getBusSid()).getData(); + if (loanSolutions != null) { + if (StringUtils.isBlank(loanSolutions.getTypeKey())) { + //担保 + } else { + //非担保 + } + } + } if ("2".equals(appOrderDetailsVo.getPayTypeKey())) { Future future10 = pool.submit(() -> { return getRisk(appOrderDetailsVo, dto); diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl new file mode 100644 index 0000000000..642886537c --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl @@ -0,0 +1,1541 @@ + + + + + Administrator + 孟哲 底 + 2 + 0 + 2024-02-21T01:04:00Z + 2024-02-21T01:04:00Z + 1 + 86 + 493 + CHINA + 4 + 1 + 578 + 16 + + + 2052-12.1.0.16250 + F8140F1EA6284E39B1433097E0F6AAD5_12 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车 + + + + + + + + + + + + + + + + + + 辆 + + + + + + + + + + + + + + + + + + 登 + + + + + + + + + + + + + + + + + + 记 + + + + + + + + + + + + + + + + + + 合 + + + + + + + + + + + + + + + + + + 同 + + + + + + + + + + + + + + + + + + + + + + + 合同编号： + + + + + + + + + + + ${contractNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲方： + + + + + + + + + + + ${invoiceName!} + + + + + + + + + + + + + + + + + + + + + + + + 乙方： + + + + + + + + + + + ${Yf!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 签订日期： + + + + + + + + + + + + + + + + + + + + + ${date!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲、乙双方经协商就车辆登记事宜达成一致订立本合同，共同遵守执行。 + + + + + + + + + + + + + + + + + + + + + 一、车辆出售方 + + + + + + + + + + + + + + + + + + + + + ${createOrgName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 二、车辆信息 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 品牌 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车架号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 发动机号 + + + + + <#list carLists as car> + + + + + + + + + + + + + + + + + + + + + + + + + ${car_index+1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${car.brand!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${car.vinNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${car.enginNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 三、车辆登记 + + + + + + + + + + + + + + + + + + + + 甲方同意乙方将其购买的上述车辆发票开至甲方名下，并同意将车辆登记在甲方名下。 + + + + + + + + + + + + + + + + + + + 四、权利义务 + + + + + + + + + + + + + + + + + + + 甲方不是车辆所有权人。甲方有义务协助乙方办理 + + + + + + + + + 车辆购置税、登记、营运、抵押、事故处理、保险理赔等手续。 + + + + + + + + + 甲方不得用车辆进行债务担保，不得转让、变卖、出租车辆。 + + + + + + + + + + + + + + + + + + + + + 五、车辆经营 + + + + + + + + + + + + + + + + + + + + + 甲方不得干涉乙方经营车辆。车辆由乙方自主经营，自负盈亏。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲方： 乙方： + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl new file mode 100644 index 0000000000..b4678fd0d6 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl @@ -0,0 +1,2879 @@ + + + + + tianlong ma + 孟哲 底 + 2 + 0 + 2024-02-21T03:50:00Z + 2024-02-21T03:50:00Z + 1 + 176 + 1009 + 8 + 2 + 1183 + 16 + + + 2052-12.1.0.16250 + 6F572EF574EC404788BBCC6BAF8548AB_12 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 新车买卖合同(现车 + + + + + + + + + + ) + + + + + + + + + + + + + + + + + + 合同 + + + + + + + + 编 + + + + + + + + 号： + + + + + + + + ${contractNo!} + + + + + + + + + + + + + + + + + + + + + + + 甲 + + + + + + + + + + 方 + + + + + + + + + + (出卖方) ： + + + + + + + + + + + + + + + + + + + + + + ${createOrgName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 乙 + + + + + + + + + + 方 + + + + + + + + + + (买受方)： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 证件 + + + + + + + + + + 号码： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 户籍/注册地址 + + + + + + + + + + ： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 乙 + + + + + + + + + + + 方 + + + + + + + + + + + 从甲方以 + + + + + + + + + + 全款方式 + + + + + + + + + + + 购买现车，现将双方权利和义务约定如下： + + + + + + + + + + + + + + + + + + + + + + + 一、 标的车辆基本信 + + + + + + + + + + 息 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <#if modelName??> + + + + + + + + + + + + + + + + + + + + + ${modelName!} + + + + <#if modelConfig??> + + + + + + + + + + + + + + + + + + + + + ${modelConfig!} + + + + <#if modelConfigs??> + + + + + + + + + + + + + + + + + + + + + ${modelConfigs!} + + + + <#if publicModel??> + + + + + + + + + + + + + + + + + + + + + ${publicModel!} + + + + <#if topName??> + + + + + + + + + + + + + + + + + + + + + ${topName!} + + + + <#if trailerName??> + + + + + + + + + + + + + + + + + + + + + ${trailerName!} + + + + <#if remarks??> + + + + + + + + + + + + + + + + + + + + + ${remarks!} + + + + <#if discountDetail??> + + + + + + + + + + + + + + + + + + + + + ${discountDetail!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 二、 + + + + + + + + + + 车辆总价 + + + + + + + + + + 款 + + + + + + + + + + 为 + + + + + + + + + + + + + + + + + + + + + + ${totalPrice!} + + + + + + + + + + + + + + + + + + + + + 元(大写 + + + + + + + + + + + + + + + + + + + + + + ${priceRemarks!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + )。 + + + + + + + + + + + + + + + + + + + + + + 三 + + + + + + + + + + 、乙方 + + + + + + + + + + 在签订合同当日 + + + + + + + + + + 向甲方交纳订金 + + + + + + + + + + + + + + + + + + + + + + ${depositTotal!} + + + + + + + + + + + + + + + + + + + + + 元， 乙方提车时交清全部车款。甲方未收到全款前， 车辆所有 + + + + + + + + + + 权归甲方所有 + + + + + + + + + + 。 + + + + + + + + + + + + + + + + + + + + + + 四、车辆交 + + + + + + + + + + 付地点 + + + + + + + + + + + + + + + + + + + + + + ${address!} + + + + + + + + + + + + + + + + + + + + + ，乙方自提。 + + + + + + + + + + + + + + + + + + + + + + 五 + + + + + + + + + + 、 + + + + + + + + + + 乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收，验 + + + + + + + + + + 收 + + + + + + + + + + 无 + + + + + + + + + + 异议的， + + + + + + + + + + 乙方接收车辆 + + + + + + + + + + ，自此，车辆毁损、灭失的风险以及对第三人的侵权责任由乙方 + + + + + + + + + + 承担。乙 + + + + + + + + + + 方 + + + + + + + + + + 提车上路时必须办理车辆临牌和保险，未办理临牌和保险产生的后果全部由乙方承担。 + + + + + + + + + + + + + + + + + + + + + + + 六 + + + + + + + + + + + 、 + + + + + + + + + + + 甲方负责提供车辆合格证及发票 + + + + + + + + + + + ，甲方所提供的发票，不作为乙方支付款项的依据 + + + + + + + + + + + 。由于车 + + + + + + + + + + 辆自身问题等甲方原因导致车辆不能登记上牌的， + + + + + + + + + + + + + + + + + + + 由甲方负 + + + + + + + + + + 责 + + + + + + + + + + 解决； 由于乙方未按有关规定时限及时办理车辆登记上牌手续或车辆注册登记所在公司的 + + + + + + + + + + + + + + + + + + + 问题 + + + + + + + + + + 等 + + + + + + + + + + 非甲方原因导致不能办理车辆登记上牌手续的， 由乙方自行解决。 + + + + + + + + + + + + + + + + + + + + + + 七、乙方交纳订金后在 10 日内不提车的，视为乙方单方放 + + + + + + + + + + 弃购车， 甲方有权将车辆另行处置， 订 + + + + + + + + + + + + + + + + + + + 金不退。 + + + + + + + + + + 如 + + + + + + + + + + 果甲方同意乙方继续履行合同的，有权要求乙方每日按合同总价款的千分之一承担违约金。 + + + + + + + + + + + + + + + + + + + + + + 乙方交纳订金后，因甲方原因导致乙方不能提车的，甲方退还乙方订金，合同终止不再履行 + + + + + + + + + + 。 + + + + + + + + + + + + + + + + + + + + + + 八、 + + + + + + + + + + 本 + + + + + + + + + + 合同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 + + + + + + + + + + + + + + + + + + + + + + + 九 + + + + + + + + + + 、本合同双方签字或盖章之时生效。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲方： + + + + + + + + + + + + + + + + + + + + 乙方： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${year!} + + + + + + + + + + 年 + + + + + + + + + + ${month!} + + + + + + + + + + 月 + + + + + + + + + + ${day!} + + + + + + + + + + 日 + + + + + + + + + + + + + + + + + + + + ${year!} + + + + + + + + + + 年 + + + + + + + + + + ${month!} + + + + + + + + + + 月 + + + + + + + + + + ${day!} + + + + + + + + + + 日 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl index 566f5d97eb..87a42f149d 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl @@ -964,7 +964,7 @@ - ${createOrgName!} + ${createOrgName!} @@ -1589,7 +1589,7 @@ - ${totalPrice!} + ${totalPrice!} @@ -1632,7 +1632,7 @@ - ${priceRemarks!} + ${priceRemarks!} @@ -1736,7 +1736,7 @@ - ${depositTotal!} + ${depositTotal!} @@ -1831,7 +1831,7 @@ - ${address!} + ${address!} @@ -2359,7 +2359,11 @@ - ${invoiceName!} + <#if invoiceName??> + ${invoiceName!} + <#else> + + @@ -2402,7 +2406,11 @@ - ${invoiceNo!} + <#if invoiceNo??> + ${invoiceNo!} + <#else> + + @@ -2480,6 +2488,17 @@ + + + + + + + + + + + From 70f435ea0ccc162219ec2f0d9fca2f7eae67c5e4 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 21 Feb 2024 14:44:25 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/commoncontract/CommonContractService.java | 10 +++++----- .../src/main/resources/ftl/existingvehicles.ftl | 4 ++-- .../main/resources/ftl/existingvehicles_black.ftl | 12 +++++++++--- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index cf3b51daaf..1e7e232c7c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -825,7 +825,7 @@ public class CommonContractService extends MybatisBaseService dateString = Arrays.asList(date.split("-")); String year = dateString.get(0); String month = dateString.get(1); @@ -939,7 +939,7 @@ public class CommonContractService extends MybatisBaseService dateString = Arrays.asList(date.split("-")); String year = dateString.get(0); String month = dateString.get(1); @@ -1042,7 +1042,7 @@ public class CommonContractService extends MybatisBaseService dateString = Arrays.asList(date.split("-")); String year = dateString.get(0); String month = dateString.get(1); @@ -1132,7 +1132,7 @@ public class CommonContractService extends MybatisBaseService dateString = Arrays.asList(date.split("-")); String year = dateString.get(0); String month = dateString.get(1); @@ -1378,7 +1378,7 @@ public class CommonContractService extends MybatisBaseService carContractListVos = new ArrayList<>(); diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl index 87a42f149d..e090caba5a 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl @@ -2360,7 +2360,7 @@ <#if invoiceName??> - ${invoiceName!} + ${invoiceName!} <#else> @@ -2407,7 +2407,7 @@ <#if invoiceNo??> - ${invoiceNo!} + ${invoiceNo!} <#else> diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl index cd8833835c..08f2adb5d2 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl @@ -1160,7 +1160,7 @@ - + @@ -2359,7 +2359,10 @@ - ${invoiceName!} + <#if invoiceName??> + ${invoiceName!} + <#else> + @@ -2402,7 +2405,10 @@ - ${invoiceNo!} + <#if invoiceNo??> + ${invoiceNo!} + <#else> + From eb8a691ceccd735bc95f30f37aa38623a01f5701 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 21 Feb 2024 15:35:33 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E7=BB=93=E6=B8=85=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-riskcenter-ui/src/views/settle/settleAdd.vue | 2 +- anrui-riskcenter-ui/src/views/settle/settleInfo.vue | 2 +- .../src/views/workFlow/jieqingFlow/settleDaiBan.vue | 2 +- .../src/views/workFlow/jieqingFlow/settleEdit.vue | 2 +- .../src/views/workFlow/jieqingFlow/settleYiBan.vue | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue index cd337f5f45..858cbeef8f 100644 --- a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue +++ b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue @@ -172,7 +172,7 @@
公司结清费用
-
贷款保整金：{{ formobj.loanSettleCompanyCostVo.loanDeposit }}
+
贷款保证金：{{ formobj.loanSettleCompanyCostVo.loanDeposit }}
diff --git a/anrui-riskcenter-ui/src/views/settle/settleInfo.vue b/anrui-riskcenter-ui/src/views/settle/settleInfo.vue index 03d1558db3..9f52bffdce 100644 --- a/anrui-riskcenter-ui/src/views/settle/settleInfo.vue +++ b/anrui-riskcenter-ui/src/views/settle/settleInfo.vue @@ -145,7 +145,7 @@
公司结清费用
-
贷款保整金：{{ formobj.loanSettleCompanyCostVo.loanDeposit }}
+
贷款保证金：{{ formobj.loanSettleCompanyCostVo.loanDeposit }}
diff --git a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue index 0b0de0e1fa..2eaca1a2ed 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue @@ -148,7 +148,7 @@
公司结清费用
-
贷款保整金：{{ formobj.loanSettleCompanyCostVo.loanDeposit }}
+
贷款保证金：{{ formobj.loanSettleCompanyCostVo.loanDeposit }}
diff --git a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue index cd6b247aa0..629b67f8ea 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue @@ -171,7 +171,7 @@
公司结清费用
-
贷款保整金：{{ formobj.loanSettleCompanyCostVo.loanDeposit }}
+
贷款保证金：{{ formobj.loanSettleCompanyCostVo.loanDeposit }}
diff --git a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue index 828aae9bf3..f544b4b654 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue @@ -145,7 +145,7 @@
公司结清费用
-
贷款保整金：{{ formobj.loanSettleCompanyCostVo.loanDeposit }}
+
贷款保证金：{{ formobj.loanSettleCompanyCostVo.loanDeposit }}
From 0a25db5126cebf4e3d849718dd10a8bc97384297 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 21 Feb 2024 15:40:22 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=9B=9E=E8=B4=AD=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue | 2 +- anrui-riskcenter-ui/src/views/buyback/buybackInfo.vue | 2 +- .../src/views/workFlow/huigouFlow/buybackDaiBan.vue | 2 +- .../src/views/workFlow/huigouFlow/buybackEdit.vue | 2 +- .../src/views/workFlow/huigouFlow/buybackYiBan.vue | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue b/anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue index 72cfccdb5e..fe9d4fa1d5 100644 --- a/anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue +++ b/anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue @@ -138,7 +138,7 @@
公司结清费用
-
贷款保整金：{{ formobj.companyCostVo.loanDeposit }}
+
贷款保证金：{{ formobj.companyCostVo.loanDeposit }}
diff --git a/anrui-riskcenter-ui/src/views/buyback/buybackInfo.vue b/anrui-riskcenter-ui/src/views/buyback/buybackInfo.vue index d324b08aa6..c9c7edb5d3 100644 --- a/anrui-riskcenter-ui/src/views/buyback/buybackInfo.vue +++ b/anrui-riskcenter-ui/src/views/buyback/buybackInfo.vue @@ -136,7 +136,7 @@
公司结清费用
-
贷款保整金：{{ formobj.companyCostVo.loanDeposit }}
+
贷款保证金：{{ formobj.companyCostVo.loanDeposit }}
diff --git a/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackDaiBan.vue index 75a57a14d9..1750c23741 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackDaiBan.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackDaiBan.vue @@ -139,7 +139,7 @@
公司结清费用
-
贷款保整金：{{ formobj.companyCostVo.loanDeposit }}
+
贷款保证金：{{ formobj.companyCostVo.loanDeposit }}
diff --git a/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue index ac7ea99c5d..b62572ec2a 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue @@ -137,7 +137,7 @@
公司结清费用
-
贷款保整金：{{ formobj.companyCostVo.loanDeposit }}
+
贷款保证金：{{ formobj.companyCostVo.loanDeposit }}
diff --git a/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackYiBan.vue index f2d52aa09e..06b630c1cb 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackYiBan.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackYiBan.vue @@ -136,7 +136,7 @@
公司结清费用
-
贷款保整金：{{ formobj.companyCostVo.loanDeposit }}
+
贷款保证金：{{ formobj.companyCostVo.loanDeposit }}
From 9cc7df1c5559196d5ea67926882d2fd7f2fe8863 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 21 Feb 2024 15:55:22 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E7=BB=93=E6=B8=85=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-riskcenter-ui/src/views/settle/settleAdd.vue | 4 +++- .../src/views/workFlow/jieqingFlow/settleEdit.vue | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue index 858cbeef8f..4fa3eaaf65 100644 --- a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue +++ b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue @@ -165,7 +165,9 @@
附件
- +
+ +
diff --git a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue index 629b67f8ea..b1c2b3e239 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue @@ -164,7 +164,9 @@
附件
- +
+ +
From 7ee356f3409e5c8e351ae66f70ca72c8c4c34929 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 21 Feb 2024 15:57:01 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=B6=E8=AE=BF?= =?UTF-8?q?=E5=87=86=E5=A4=87=E7=AE=A1=E7=90=86--=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thehomevisitisready.vue | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/anrui-riskcenter-ui/src/views/homevisitpreparation/thehomevisitisready.vue b/anrui-riskcenter-ui/src/views/homevisitpreparation/thehomevisitisready.vue index 0bbfb1a050..e07834bbb2 100644 --- a/anrui-riskcenter-ui/src/views/homevisitpreparation/thehomevisitisready.vue +++ b/anrui-riskcenter-ui/src/views/homevisitpreparation/thehomevisitisready.vue @@ -54,7 +54,7 @@ @@ -133,6 +133,7 @@ import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import ButtonBar from '@/components/ButtonBar' import salesOrder from '@/components/publicPage/salesOrder' +import {getStorage} from "@/utils/auth"; export default { name: 'TheHomeVisitIsReady', @@ -265,6 +266,28 @@ export default { } this.getList() }, + toDownLoad(row) { + var xhr = new XMLHttpRequest() + xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + row.downUrl + '&outFileName=' + '消贷合同', true) + xhr.setRequestHeader('token', getStorage()) + xhr.responseType = 'blob' + xhr.onload = function(e) { + // 如果请求执行成功 + var blob = this.response + var filename = '消贷合同.pdf' + var a = document.createElement('a') + // blob.type="application/octet-stream"; + // 创键临时url对象 + var url = URL.createObjectURL(blob) + a.href = url + a.download = filename + a.click() + // 释放之前创建的URL对象 + window.URL.revokeObjectURL(url) + } + // 发送请求 + xhr.send() + }, lookSale(row) { this.viewState = 2 this.$refs['divSale'].showInfo(row.saleOrderSid) From 7261a9ac348f0a195a918b79cddf6f1fe3f41363 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 21 Feb 2024 16:03:51 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E7=BB=93=E6=B8=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loansettleapply/LoanSettleApplyMapper.xml | 2 +- .../LoanSettleApplyService.java | 58 ++++++++++++++----- 2 files changed, 44 insertions(+), 16 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml index 51768b3734..e2de074403 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml @@ -50,7 +50,7 @@ ${ew.sqlSegment} - order by la.useOrgName desc, la.createTime desc, la.loanContractNo desc, la.vinNo + order by la.createTime desc,la.useOrgName desc, la.createTime desc, la.loanContractNo desc, la.vinNo