From c6f15400d502852b43acefcd33dbcfbb4610b5fc Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 18:10:20 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java | 2 +-
ycl-common/src/main/java/com/ycl/utils/EasyExcelUtils.java | 12 ++++++++++++
ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
index d2c0283..0e06410 100644
--- a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
@@ -141,7 +141,7 @@
public void exportDpt(HttpServletResponse response) {
List<UmsDepartDto> umsDepartDtos = departService.departExp();
String sheetName = "閮ㄩ棬瀵煎嚭";
- EasyExcelUtils.export(response, sheetName, UmsDepartDto.class, umsDepartDtos);
+ EasyExcelUtils.export1(response, sheetName, UmsDepartDto.class, umsDepartDtos, "閮ㄩ棬瀵煎嚭");
}
@Resource
diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
index fc838c5..0562bc1 100644
--- a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
@@ -150,7 +150,7 @@
public void exportUser(HttpServletResponse response) {
List<UmsUserDto1> umsUserDtos = adminService.userExp();
String sheetName = "鐢ㄦ埛瀵煎嚭";
- EasyExcelUtils.export(response, sheetName, UmsUserDto1.class, umsUserDtos);
+ EasyExcelUtils.export1(response, sheetName, UmsUserDto1.class, umsUserDtos, "鐢ㄦ埛瀵煎嚭");
}
@Resource
diff --git a/ycl-common/src/main/java/com/ycl/utils/EasyExcelUtils.java b/ycl-common/src/main/java/com/ycl/utils/EasyExcelUtils.java
index 50156d9..4d9f1b7 100644
--- a/ycl-common/src/main/java/com/ycl/utils/EasyExcelUtils.java
+++ b/ycl-common/src/main/java/com/ycl/utils/EasyExcelUtils.java
@@ -8,6 +8,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Collection;
@@ -30,6 +31,17 @@
}
@SneakyThrows
+ public static void export1(HttpServletResponse response, String sheetName, Class className, Collection<?> collection, String fileName) {
+ fileName = URLEncoder.encode(fileName, "UTF-8");
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + fileName + ".xlsx");
+ EasyExcel.write(response.getOutputStream(), className)
+ .sheet(sheetName)
+ .doWrite(collection);
+ }
+
+ @SneakyThrows
public static void importDepartFile(MultipartFile file) throws IOException {
EasyExcel.read(file.getInputStream())
.head(UmsDepartDto.class)
--
Gitblit v1.8.0