From 299ffdb4cda87b3f4ad94723586d757c1e06725c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 24 Aug 2021 11:15:50 +0800
Subject: [PATCH] 用户新增发证时间字段，考试合格生成保安证，记录时间
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 67e1d92..54a2f60 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -53,6 +53,7 @@
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Role;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.excel.SecurityImporter;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.excel.UserImporter;
import org.springblade.modules.system.node.TreeNode;
@@ -100,7 +101,7 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "查看详情", notes = "传入id")
@GetMapping("/detail")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+// @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<UserVO> detail(User user) {
User detail = userService.getOne(Condition.getQueryWrapper(user));
return R.data(UserWrapper.build().entityVO(detail));
@@ -297,6 +298,19 @@
return R.success("操作成功");
}
+
+ /**
+ * 导入保安员
+ */
+ @PostMapping("import-security")
+ @ApiOperationSupport(order = 12)
+ @ApiOperation(value = "导入用户", notes = "传入excel")
+ public R importSecurity(MultipartFile file, Integer isCovered) {
+ SecurityImporter securityImporter = new SecurityImporter(userService, false);
+ ExcelUtil.save(file, securityImporter, UserExcel.class);
+ return R.success("操作成功");
+ }
+
// /**
// * 导出用户
// */
@@ -322,6 +336,17 @@
public void exportUser(HttpServletResponse response) {
List<UserExcel> list = new ArrayList<>();
ExcelUtil.export(response, "用户数据模板", "用户数据表", list, UserExcel.class);
+ }
+
+ /**
+ * 保安员导出模板
+ */
+ @GetMapping("export-template-security")
+ @ApiOperationSupport(order = 14)
+ @ApiOperation(value = "导出模板")
+ public void exportSecurity(HttpServletResponse response) {
+ List<UserExcel> list = new ArrayList<>();
+ ExcelUtil.export(response, "保安员导入数据模板", "保安员数据表", list, UserExcel.class);
}
@@ -468,6 +493,7 @@
if (Func.isNotEmpty(user.getPassword())) {
user.setPassword(DigestUtil.encrypt(user.getPassword()));
}
+ user.setTenantId("000000");
//用户新增
boolean status = userService.save(user);
//获取从业记录
--
Gitblit v1.9.3