From 94c614eb177fa5bb37fd24d51324e77b66a50ead Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 7 Nov 2023 13:46:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=90=88=E5=90=8C=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=85=A8=E6=AC=BE=E8=B4=B7=E6=AC=BE=E7=9A=84=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commoncontract/CommonContractService.java | 31 ++++++-------------
 1 file changed, 10 insertions(+), 21 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 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<CommonContractMapp
                 File file = new File(docPdfComponent.getUploadTemplateUrl() + future4.get());
                 filesList.add(file);
             }
+
+            if ("2".equals(appOrderDetailsVo.getPayTypeKey())) {
+                Future<String> 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<CommonContractMapp
                 printConfirmVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + urlAll);
                 list.add(printConfirmVo);
             }
-            if ("2".equals(appOrderDetailsVo.getPayTypeKey())) {
-                Future<String> 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());