From 0c4b37ef2de376e8d02fe81a6af384929579d662 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 11:30:37 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
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 cfb16af..fa325a3 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
@@ -136,13 +136,21 @@
@ApiOperation("鐢ㄦ埛瀵煎嚭")
- @PostMapping("/import")
+ @PostMapping("/export")
public void exportUser(HttpServletResponse response) {
List<UmsUserDto> umsUserDtos = adminService.userExp();
String sheetName = "鐢ㄦ埛瀵煎嚭";
EasyExcelUtils.export(response, sheetName, UmsUserDto.class, umsUserDtos);
}
+ @ApiOperation("鐢ㄦ埛瀵煎叆")
+ @PostMapping("/import")
+ public CommonResult importUser(MultipartFile file) throws IOException {
+ EasyExcelUtils.importDepartFile(file);
+ return CommonResult.success(true, "瀵煎叆鎴愬姛");
+ }
+
+
@ApiOperation("鑾峰彇鎸囧畾鐢ㄦ埛淇℃伅")
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
--
Gitblit v1.8.0