From b6dd47b05107fc36d8ff4f7f29a4446521f95503 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 02 一月 2025 18:44:28 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/PdfMergeController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/PdfMergeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/PdfMergeController.java
index f180dff..9f98860 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/PdfMergeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/PdfMergeController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.project;
+import com.itextpdf.text.DocumentException;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.utils.MergeFilesToPDFUtils;
@@ -101,9 +102,14 @@
ServiceDonatebaseinfo donatebaseinfo = donatebaseinfoService.getById(serviceDonateannexes.get(0).getInfoid());
String fileName = donatebaseinfo.getIdcardno() + donatebaseinfo.getName() + ".pdf";
- String[] str = list.toArray(new String[0]);
- //鏂囦欢鍚堝苟
- mergeFilesToPDFUtils.mergePDF(str, fileName, response);
+ try {
+ //鏂囦欢鍚堝苟
+ mergeFilesToPDFUtils.mergePdfFiles(list, fileName);
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (DocumentException e) {
+ e.printStackTrace();
+ }
//鍒犻櫎涓存椂鏂囦欢
for (MegerIsRemove megerIsRemove : megerIsRemoveList) {
if (megerIsRemove.getIsdel()) {
--
Gitblit v1.9.3