From 2ef6c51b3524ceffbef32360a6a4578a69fcdae7 Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Wed, 3 Jan 2024 13:49:30 +0800
Subject: [PATCH] =?UTF-8?q?#=20=E7=BA=BF=E4=B8=8B=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=A5=A8=E9=A2=84=E8=A7=88=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hzims-service/ticket/pom.xml                            |  9 ++++++++-
 .../service/impl/FirstWorkTicketServiceImpl.java        | 17 ++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/hzims-service/ticket/pom.xml b/hzims-service/ticket/pom.xml
index 5bf9e3d..3ce24e7 100644
--- a/hzims-service/ticket/pom.xml
+++ b/hzims-service/ticket/pom.xml
@@ -298,7 +298,14 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
-
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <!--设置为true，以便把本地的system的jar也包括进来-->
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java
index 677cb96..97f7589 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java
@@ -395,27 +395,27 @@ public class FirstWorkTicketServiceImpl extends BaseServiceImpl<WorkTicketInfoMa
 		//安全隔离措施附页 (true,展示附件,false,不展示附件)
 		if (workTicketInfo.getIsSafety()) {
 			XWPFDocument xwpfDocument = this.fillDocument("template/" + TicketConstant.SECURE_PAGE, params);
-			result.add(xwpfDocument);
+			//result.add(xwpfDocument);
 		}
 		//危险点分析与预控措施票 (true,展示附件,false,不展示附件)
 		if (workTicketInfo.getIsHazard()) {
 			XWPFDocument xwpfDocument = this.fillDocument("template/" + TicketConstant.SAFETY_PAGE, params);
-			result.add(xwpfDocument);
+			//result.add(xwpfDocument);
 		}
 		//动火工作票 (true,展示附件,false,不展示附件)
 		if (workTicketInfo.getIsRailway()) {
 			XWPFDocument xwpfDocument = this.fillDocument("template/" + TicketConstant.FLIGHT_PAGE, params);
-			result.add(xwpfDocument);
+			//result.add(xwpfDocument);
 		}
 		//有限空间监测记录单(true,展示附件,false,不展示附件)
 		if (workTicketInfo.getIsLimited()) {
 			XWPFDocument xwpfDocument = this.fillDocument("template/" + TicketConstant.SPACE_PAGE, params);
-			result.add(xwpfDocument);
+			//result.add(xwpfDocument);
 		}
 		//每日开工和收工时间附页
 		if (workTicketInfo.getIsStart()) {
 			XWPFDocument xwpfDocument = this.fillDocument("template/" + TicketConstant.START_PAGE, params);
-			result.add(xwpfDocument);
+			//result.add(xwpfDocument);
 		}
 		return result;
 	}
@@ -431,12 +431,7 @@ public class FirstWorkTicketServiceImpl extends BaseServiceImpl<WorkTicketInfoMa
 	}
 
 	private void exportTicketWord(List<XWPFDocument> documents, String savePath) throws IOException {
-		FileOutputStream out = new FileOutputStream(savePath, true);
-		Path file = Paths.get(path);
-		if(Files.exists(file)) {
-			Files.delete(file);
-		}
-		new File(savePath).createNewFile();
+		FileOutputStream out = new FileOutputStream(savePath);
 		for (XWPFDocument document : documents) {
 			document.write(out);
 		}