From d69330f0872bda6e595678b72daa077ee7b9c906 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 1 Nov 2022 16:57:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95-=E5=A1=AB=E5=86=99=E4=BA=BA?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BAbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   | 36 +++++++------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index a905e169a..e81538248 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -2452,13 +2452,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		if (StringUtils.isNotEmpty(paramsCollectManifestVO.getExportName())) {
 			fileOriName = paramsCollectManifestVO.getExportName();
 		}
-		//创建临时文件夹
-		String fileNowPath = uploadpath + "/tempZip/" + UUID.randomUUID().toString().replace("-","") + File.separator + fileOriName;
-		File nowFile = new File(fileNowPath);
-		if (nowFile.exists()) {
-			nowFile.delete();
-		}
-		nowFile.mkdirs();
+
 		try{
 			String fileName = fileOriName + ".xlsx";
 			// 设置表格相关属性
@@ -2555,24 +2549,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			}
 
 			String repFileName = fileName.replaceAll("/","_");
-			excelOS = new FileOutputStream(fileNowPath + File.separator + repFileName);
 			response.setHeader("Content-Disposition",
-					"attachment; filename=\""+ ReadExcel.encodeFileName(fileOriName+".zip", request)  +"\"");
+					"attachment; filename=\""+ ReadExcel.encodeFileName(repFileName+".xlsx", request)  +"\"");
 			response.setContentType("application/force-download");
 			response.flushBuffer();
 			os = response.getOutputStream();
-			workbook.write(excelOS);
-			excelOS.flush();
-			excelOS.close();
-			ZipUtil.zip(fileNowPath,fileNowPath+".zip");
-			FileInputStream fis = new FileInputStream(fileNowPath+".zip");
-			int len = 0;
-			while ((len = fis.read()) != -1) {
-				os.write(len);
-			}
-			os.flush();
-			os.close(); // 后开先关
-			fis.close(); // 先开后关
+			workbook.write(os);
 		} catch (Exception e) {
 			if (e instanceof JeroBootException){
 				throw new JeroBootException(e.getMessage());
@@ -2587,9 +2569,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			}
 		} finally {
 			IOUtils.closeQuietly(os);
-			IOUtils.closeQuietly(excelOS);
-			File tempZipFile = new File(uploadpath + "/tempZip");
-			FileUtil.deleteContents(tempZipFile);
+			try {
+				if (workbook != null) {
+					workbook.close();
+				}
+			} catch (IOException e) {
+				log.error("发生异常，异常信息为："+e.getMessage(), e);
+			}
 		}
 	}
 
@@ -3159,6 +3145,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
 		ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
+		BeanUtils.copyProperties(paramsCollectManifestVO, paramsCollectManifestEO);
+		paramsCollectManifestEO.setParamsManifestId(null);
 		QueryWrapper<ParamsCollectManifestEO> queryWrapper = QueryGenerator.initQueryWrapper(paramsCollectManifestEO, req.getParameterMap());
 		queryWrapper.lambda().eq(ParamsCollectManifestEO::getParamsManifestId, paramsManifestId)
 				.eq(ParamsCollectManifestEO::getDre, loginUser.getUsername())