From a9943ed22bd7568924bf98c462139269d873cd8a Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 30 Jun 2022 17:40:45 +0800
Subject: [PATCH] 新增保安员证编号批量导入，保安员新增，从业记录同步sql 修改
---
src/main/java/org/springblade/modules/securitypaper/controller/SecurityPaperController.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 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 1b82585..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,12 +104,22 @@
/**
- * 导入保安员证数据
+ * 导入保安员证数据（需用户编号，无效保安员身份证号码）
*/
@PostMapping("import-security-paper")
public R importSecurityPaper(MultipartFile file, Integer isCovered, String deptId) {
SecurityPaperImporter securityImporter = new SecurityPaperImporter(securityPaperService, false,deptId);
ExcelUtil.save(file, securityImporter, SecurityPaperExcel.class);
+ return R.success("操作成功");
+ }
+
+ /**
+ * 导入保安员证数据(需身份证号码，无需用户编号)
+ */
+ @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("操作成功");
}
@@ -119,19 +131,19 @@
public void exportSecurity(HttpServletResponse response) throws IOException {
List<SecurityPaperExcel> list = new ArrayList<>();
SecurityPaperExcel securityExcel = new SecurityPaperExcel();
- securityExcel.setDeptId("xxx保安公司");
+ securityExcel.setId("12124121245121");
securityExcel.setRealName("张三");
- securityExcel.setPhone("12345678901");
- securityExcel.setCardid("360XXX19XXXXXX****");
- securityExcel.setRegistered("江西省南昌市******");
+// securityExcel.setPhone("12345678901");
+// securityExcel.setCardid("360XXX19XXXXXX****");
+// securityExcel.setRegistered("江西省南昌市******");
list.add(securityExcel);
SecurityPaperExcel securityExcel1 = new SecurityPaperExcel();
- securityExcel1.setDeptId("xxx保安公司");
+ securityExcel.setId("12124121245121");
securityExcel1.setRealName("李四");
- securityExcel1.setPhone("12345678901");
- securityExcel1.setCardid("360XXX19XXXXXX****");
- securityExcel1.setRegistered("江西省南昌市******");
+// securityExcel1.setPhone("12345678901");
+// securityExcel1.setCardid("360XXX19XXXXXX****");
+// securityExcel1.setRegistered("江西省南昌市******");
list.add(securityExcel1);
String fileName = null;
try {
--
Gitblit v1.9.3