From 195a581f948193262ec865524a85bf177c673ba1 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 12 Jul 2022 18:53:33 +0800
Subject: [PATCH] update

---
 .../LawsOpinionAssessmentResultEOServiceImpl.java  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
index 23fc954b6..3679cf031 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
@@ -156,8 +156,8 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
 	@Override
 	public void exportXls(HttpServletResponse response, HttpServletRequest request, LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO, Map<String,Object> params) {
 
-		Integer pageNo = (Integer) params.get("pageNo");
-		Integer pageSize = (Integer) params.get("pageSize");
+		Integer pageNo = Integer.parseInt(params.get("pageNo").toString());
+		Integer pageSize = Integer.parseInt(params.get("pageSize").toString());
 		String exportAll = (String)params.get("exportAll");
 		String ids = (String)params.get("ids");
 		String cut = (String)params.get("cut");
@@ -191,6 +191,8 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
 		OutputStream os = null;
 		HSSFWorkbook workbook = new HSSFWorkbook();
 
+		String path = uploadpath + "/tempZip/evaluationResults/" + System.currentTimeMillis();
+
 		try {
 			response.setHeader("Content-Disposition",
 					"attachment; filename=" + fileName);
@@ -227,12 +229,13 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
 					dataRow.createCell(5).setCellValue(submitTimeStr);
 				}
 			}
+
 			if ("excel".equals(exportType)) {
 				os = response.getOutputStream();
 				workbook.write(os);
 				os.flush();
 			}else {
-				String path = uploadpath + "/tempZip/evaluationResults";
+
 				File fileTemp = new File(path);
 				if (fileTemp.exists()) {
 					fileTemp.delete();
@@ -282,6 +285,7 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
 				}
 				os.flush();
 				fis.close();
+				excelOS.close();
 			}
 
 		}catch (IOException ex){
@@ -292,9 +296,9 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
 			}
 		}finally {
 			IOUtils.closeQuietly(os);
-			File file = new File(uploadpath + "/tempZip/evaluationResults");
+			File file = new File(path);
 			FileUtil.deleteContents(file);
-			File fileTemp = new File(uploadpath + "/tempZip/evaluationResults.zip");
+			File fileTemp = new File(path + ".zip");
 			FileUtil.deleteContents(fileTemp);
 		}
 	}