From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可
---
src/main/java/org/springblade/modules/system/service/IUserService.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index 70693e6..44a5bdf 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -69,11 +69,9 @@
*
* @param page
* @param user
- * @param deptId
- * @param tenantId
* @return
*/
- IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user, Long deptId, String tenantId);
+ IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user);
/**
* 自定义分页
@@ -230,12 +228,12 @@
/**
* 自定义用户列表(只有保安员)
*/
- IPage<User> selectUserPageSecurity(IPage<User> page, User user, Long deptId, String s);
+ IPage<User> selectUserPageSecurity(IPage<User> page, User user);
/**
* 自定义用户列表(只有保安员),根据保安员查
*/
- List<User> selectUserPageSecurityUnit(IPage<User> page, User user, Long deptId, String s);
+ List<User> selectUserPageSecurityUnit(IPage<User> page, User user);
/**
* 保安员列表，帅选无保安证
@@ -245,7 +243,7 @@
* @param s
* @return
*/
- IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page, UserVO user, Long deptId, String s);
+ IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page, UserVO user);
/**
* 保安员列表树 安员列表树，帅选无保安证,下拉tree
@@ -270,4 +268,42 @@
* @return
*/
List<User> getNotApplyIdList(String deptId);
+
+ /**
+ * 计算保安人员年龄
+ * @param userId
+ * @return
+ */
+ UserVO getUserAgeById(Long userId);
+
+ List<Map<String, Object>> selectUser();
+
+ /**
+ * 导入保安员
+ * @param data
+ * @param isCovered
+ */
+ void importSecurity(List<UserExcel> data, Boolean isCovered);
+
+ /**
+ * 根据保安员编码查询保安信息
+ * @param securityNumber 保安证编码
+ * @return
+ */
+ UserVO getUserInfoBySecurityNumber(String securityNumber);
+
+ /**
+ * 保安员信息
+ * @param user
+ * @return
+ */
+ UserVO getUserDetails(User user);
+ List<Map<String, Object>> seleL(String type,String deptid,String jurisdiction,Long userId);
+
+ /**
+ * 查询账号相同的用户数量
+ * @param account
+ * @return
+ */
+ Integer selectCount(String account);
}
--
Gitblit v1.9.3