From 63ea601aa950e88237728bf183e30268a3af8616 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 12 Jul 2022 10:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/securitypaper/controller/SecurityPaperController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/securitypaper/controller/SecurityPaperController.java b/src/main/java/org/springblade/modules/securitypaper/controller/SecurityPaperController.java
index 377d026..334c306 100644
--- a/src/main/java/org/springblade/modules/securitypaper/controller/SecurityPaperController.java
+++ b/src/main/java/org/springblade/modules/securitypaper/controller/SecurityPaperController.java
@@ -13,6 +13,8 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.securitypaper.entity.SecurityPaper;
+import org.springblade.modules.securitypaper.excel.PaperExcel;
+import org.springblade.modules.securitypaper.excel.PaperImporter;
import org.springblade.modules.securitypaper.excel.SecurityPaperExcel;
import org.springblade.modules.securitypaper.excel.SecurityPaperImporter;
import org.springblade.modules.securitypaper.service.SecurityPaperService;
@@ -102,7 +104,7 @@
/**
- * 导入保安员证数据
+ * 导入保安员证数据（需用户编号，无效保安员身份证号码）
*/
@PostMapping("import-security-paper")
public R importSecurityPaper(MultipartFile file, Integer isCovered, String deptId) {
@@ -112,6 +114,16 @@
}
/**
+ * 导入保安员证数据(需身份证号码，无需用户编号)
+ */
+ @PostMapping("import-paper")
+ public R importPaper(MultipartFile file, Integer isCovered) {
+ PaperImporter paperImporter = new PaperImporter(securityPaperService, false);
+ ExcelUtil.save(file, paperImporter, PaperExcel.class);
+ return R.success("操作成功");
+ }
+
+ /**
* 导出模板
*/
@GetMapping("export-template-security-paper")
--
Gitblit v1.9.3