From 2174761154ce12bc85250d8ce7c9c35b675ad8b8 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Fri, 8 Jul 2022 18:39:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5=E5=BA=93-?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC=E5=87=BAword=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsReportDetailEOServiceImpl.java | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
index 53f031739..60754ba17 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
@@ -695,6 +695,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 				downLoadFileList(allRelevFileList,fileNowPath + File.separator + "导出文件");
 			}
 
+			// 拿取模板
 			String repFileName = fileName.replaceAll("/","_");
 			wordOS = new FileOutputStream(fileNowPath + File.separator + repFileName);
 			if (CosBootUtil.doesObjectExist(templateUrl)) {
@@ -702,24 +703,32 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 				com.qcloud.cos.utils.IOUtils.copy(wordTemplate, wordOS);
 			}
 
-			byte[] wordContent =  Docx4jUtil.of(fileNowPath + File.separator + repFileName).addParam("title", "测试文档标题")
+			// 替换占位符内容
+			byte[] wordContent =  Docx4jUtil.of(fileNowPath + File.separator + repFileName)
 					.addParams(params)
 					.get();
+			ByteArrayInputStream wordis = new ByteArrayInputStream(wordContent);
+			OutputStream wordFileOS = new FileOutputStream(fileNowPath + File.separator + repFileName);
+			int len1 = 0;
+			while ((len1 = wordis.read()) != -1) {
+				wordFileOS.write(len1);
+			}
+			wordOS.flush();
+			wordOS.close();
+			wordFileOS.flush();
+			wordFileOS.close();
 
+			// 打包导出压缩包
 			response.setHeader("Content-Disposition",
 					"attachment; filename=\""+ ReadExcel.encodeFileName(fileOriName+".zip", request)  +"\"");
 			response.setContentType("application/force-download");
 			response.flushBuffer();
 			os = response.getOutputStream();
-
-			wordOS.flush();
-			wordOS.close();
 			ZipUtil.zip(fileNowPath,fileNowPath+".zip");
-//			FileInputStream fis = new FileInputStream(fileNowPath+".zip");
-			ByteArrayInputStream fis = new ByteArrayInputStream(wordContent);
-			int len = 0;
-			while ((len = fis.read()) != -1) {
-				os.write(len);
+			FileInputStream fis = new FileInputStream(fileNowPath+".zip");
+			int len2 = 0;
+			while ((len2 = fis.read()) != -1) {
+				os.write(len2);
 			}
 
 			// 添加导出历史