From 19f40c8e0649ae81b3f0183a6f4c8aa6c3db39bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 18 Nov 2021 17:54:37 +0800
Subject: [PATCH] 证书打印信息导出修改,已过考试的,系统每天凌晨1点定时清理,标记为缺考,并生成缺考记录,保安员导入新增年龄判断,超过60岁的不能导入

---
 src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java b/src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java
index 4e72d3a..811945a 100644
--- a/src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java
+++ b/src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java
@@ -367,9 +367,9 @@
 									0, // y缩放
 									1023, //最大1023
 									255, //最大255
-									(short) i,  //宽度占几格 0开始
+									(short) i,  //宽度 0开始
 									0, //在第几行
-									(short) i, //宽度占几格 0开始
+									(short) i, //宽度 0开始
 									0 //第几列
 								);
 						//插入图片
@@ -397,14 +397,16 @@
 			}
 			//判断余下的
 			if (excelList.size()>0){
-				rowNum++;
+				rowNum = rowNum + 2;
 				//写入表格
 				writeBookForEach(excelList,rowNum,workBook,sheet,patriarch);
 			}
 		}
 		//导出数据
-		response.setContentType("application/vnd.ms-excel; charset=UTF-8");
-		response.setHeader("Content-Disposition", "attachment;filename=" + "证书打印信息导出"+DateUtil.time() + ".xlsx");
+		response.setContentType("application/vnd.ms-excel");
+		response.setCharacterEncoding(org.apache.commons.codec.Charsets.UTF_8.name());
+		String fileName = URLEncoder.encode("证书打印信息导出"+ DateUtil.time(), Charsets.UTF_8.name());
+		response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xlsx");
 		workBook.write(response.getOutputStream());
 	}
 

--
Gitblit v1.9.3