From 74a5f5d0b1bf043be5b51071f2e20bf011841e91 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Sat, 11 Jun 2022 16:24:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BAword=EF=BC=8C=E8=8E=B7=E5=8F=96word=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 2d73b01d4..7b9fc917e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -5464,13 +5464,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		dataMap.put("REGULATION_ENG", StringUtils.isNotEmpty(regulationOwnerName) ? regulationOwnerName : "");
 		log.debug("导出word报告，查询数据结束 =============================================================================");
 		log.debug("导出word报告，获取模板开始 =============================================================================");
-		File templateFile = new File(exportPdfTempPath + "temp/ComplianceReportTemplate.docx");
+		//File templateFile = new File(exportPdfTempPath + "temp/ComplianceReportTemplate.docx");
 		InputStream inputStream = ProjectLawsInventoryEOServiceImpl.class.getClassLoader().getResourceAsStream("exportPdfTemp/ComplianceReportTemplate.docx");
-		try {
+		/*try {
 			FileUtils.copyInputStreamToFile(inputStream, templateFile);
 		} catch (IOException e) {
 			e.printStackTrace();
-		}
+		}*/
 //
 //		try {
 //			OutputStream os = new FileOutputStream(templateFile);
@@ -5486,7 +5486,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 //		}
 
 		log.debug("导出word报告，获取模板结束 =============================================================================");
-		if(templateFile != null){
+		//if(templateFile != null){
+		if(inputStream != null){
 			try {
 				String uuid = UUID.randomUUID().toString();
 				//final String TEMP_FILE_PATH = System.getProperty("os.name").toLowerCase().contains("windows") ? System.getProperty("user.dir") + File.separator : "/home/admin/tempfile/";
@@ -5499,8 +5500,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				String outFile = TEMP_FILE_PATH + uuid + ".docx";
 				exportFile = new File(outFile);
 				FileOutputStream os = new FileOutputStream(outFile);
-				WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.load(new FileInputStream(templateFile));
-//				WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.load(inputStream);
+				//WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.load(new FileInputStream(templateFile));
+				WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.load(inputStream);
 
 				//验证符合性流程实例id
 				String verifyPId = projectTaskInventoryEO.getVerifyPId();
@@ -5675,4 +5676,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		WordprocessingMLPackage template = WordprocessingMLPackage.load(new FileInputStream(new File(name)));
 		return template;
 	}
+
+//	public static void main(String[] args){
+//		InputStream inputStream = ProjectLawsInventoryEOServiceImpl.class.getClassLoader().getResourceAsStream("exportPdfTemp/ComplianceReportTemplate.docx");
+//		Resource resource = new ClassPathResource("ComplianceReportTemplate.docx");
+//		try {
+//			InputStream inputStream1 = resource.getInputStream();
+//			System.out.println(inputStream1 != null);
+//		} catch (IOException e) {
+//			e.printStackTrace();
+//		}
+//		System.out.println(inputStream != null);
+//	}
 }