From 03f42f3e256dbc2e0c4e9b7ce3cb6a85df7cf130 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 27 Aug 2021 20:40:40 +0800
Subject: [PATCH] 1.统计
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 ca4679f..16a2330 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -422,7 +422,7 @@
userExcel.setRegistered("江西南昌");
userExcel.setRtime("2021-05-01");
userExcel.setHold("是");
- userExcel.setSex("赣洪202100001");
+ userExcel.setSecuritynumber("赣洪202100001");
list.add(userExcel);
UserExcel userExcel1 = new UserExcel();
userExcel1.setDeptId("xxx保安公司");
@@ -439,7 +439,7 @@
userExcel1.setRegistered("江西南昌");
userExcel1.setRtime("2021-05-01");
userExcel1.setHold("否");
- userExcel1.setSex("");
+ userExcel1.setSecuritynumber("");
list.add(userExcel1);
ExcelUtil.export(response, "保安员导入数据模板", "保安员数据表", list, UserExcel.class);
}
@@ -640,5 +640,30 @@
}
+ /**
+ * 保安员信息
+ * @param user
+ * @return
+ */
+ @GetMapping("/getUserDetails")
+ public R getUserDetails(User user) {
+ return R.data(userService.getUserDetails(user));
+ }
+
+
+ /**
+ *
+ * @param type 1:保安 2:公安
+ * @param deptid
+ * @param jurisdiction
+ * @return
+ */
+ @GetMapping("/seleL")
+ public R seleL(String type,String deptid, String jurisdiction) {
+ List<Map<String, Object>> list = userService.seleL(type,deptid, jurisdiction);
+ return R.data(list);
+ }
+
+
}
--
Gitblit v1.9.3