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 d2337d36cb..444e97c2b4 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 @@ -2011,6 +2011,16 @@ public class CommonContractService extends MybatisBaseService future10 = pool.submit(() -> { + return getRisk(appOrderDetailsVo, dto); + }); + if (StringUtils.isNotBlank(future10.get())) { + File file = new File(docPdfComponent.getUploadTemplateUrl() + future10.get()); + filesList.add(file); + } + } if (filesList.size() > 0) { String typeName = appOrderDetailsVo.getPayType() + contractNo + ".pdf"; File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName); @@ -2023,27 +2033,6 @@ public class CommonContractService extends MybatisBaseService future10 = pool.submit(() -> { - return getRisk(appOrderDetailsVo, dto); - }); - if (StringUtils.isNotBlank(future10.get())) { - File file = new File(docPdfComponent.getUploadTemplateUrl() + future10.get()); - filesList.add(file); - } - if (filesList.size() > 0) { - String typeName = appOrderDetailsVo.getPayType() + contractNo + ".pdf"; - File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName); - System.out.println("-========" + docPdfComponent.getUploadTemplateUrl() + typeName); - urlAll = typeName; - } - if (StringUtils.isNotBlank(urlAll)) { - printConfirmVo = new PrintConfirmVo(); - printConfirmVo.setName(MessageFormat.format("《{0}》", appOrderDetailsVo.getPayType() + contractNo)); - printConfirmVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + urlAll); - list.add(printConfirmVo); - } - } //生成合同数据 //根据销售订单sid查询合同表中是否存在 commonContractBuscenterVo = baseMapper.selectByBusSid(dto.getBusSid());