From 5ee01df0b500ee7b91f5fad67091edca0b1ca4c4 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 15 Aug 2022 15:46:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=95=B4=E5=90=88=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsMonthlyReportWriteEOServiceImpl.java      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
index ff53dad1a..5e947cab4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
@@ -456,8 +456,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 		List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOService.list();
 		lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOS.stream()
 				.filter(e -> memoriesChapterList.contains(e.getId())).collect(Collectors.toList());
-
-		String path = uploadpath + "/tempZip";
+		long l = System.currentTimeMillis();
+		String path = uploadpath + "/tempZip"+l;
 		File fileTemp = new File(path);
 		if (fileTemp.exists()) {
 			fileTemp.delete();
@@ -477,13 +477,15 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 				os.write(len);
 			}
 			os.flush();
+			os.close();
+			fis.close();
 		} catch (Exception e) {
 
 		}finally {
 			IOUtils.closeQuietly(os);
-			File file = new File(uploadpath + "/tempZip");
+			File file = new File(uploadpath + "/tempZip"+l);
 			FileUtil.deleteContents(file);
-			File fileTem = new File(uploadpath + "/tempZip.zip");
+			File fileTem = new File(uploadpath + "/tempZip"+l+".zip");
 			FileUtil.deleteContents(fileTem);
 		}
 		//导出月报后修改列表状态