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/mapper/UserMapper.java |   73 ++++++++++++++++++++++++++++++++++--
 1 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index bb2fdfe..750ee79 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -22,6 +22,7 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
+import org.springblade.modules.dispatcher.vo.DispatcherVO;
 import org.springblade.modules.system.excel.UserExcel;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.node.TreeNode;
@@ -46,7 +47,7 @@
 	 * @param tenantId
 	 * @return
 	 */
-	List<UserVO> selectUserPages(IPage<UserVO> page, @Param("user") UserVO user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+	List<UserVO> selectUserPages(IPage<UserVO> page, @Param("user") UserVO user);
 
 
 	/**
@@ -87,16 +88,15 @@
 	/**
 	 * 自定义用户列表(只有保安员)
 	 */
-	List<User> selectUserPageSecurity(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+	List<User> selectUserPageSecurity(IPage<User> page, @Param("user") User user);
 
 	/**
 	 * 保安员列表,帅选无保安证
 	 * @param page
 	 * @param user
-	 * @param tenantId
 	 * @return
 	 */
-    IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page,@Param("user") UserVO user, @Param("deptIdList")List<Long> deptIdList,  @Param("tenantId") String tenantId);
+    IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page,@Param("user") UserVO user);
 
 	/**
 	 * 保安员列表树 安员列表树,帅选无保安证,下拉tree
@@ -106,6 +106,8 @@
 	@MapKey(value = "id")
 	@SqlParser(filter=true)
 	Map<Long, TreeNode> getSecurityApplyTree(@Param("user") UserVO user);
+
+
 	List<Map<Object,Object>> selectInr(String deptid);
 
 	/**
@@ -121,4 +123,67 @@
 	 * @return
 	 */
     List<User> getNotApplyIdList(@Param("deptId")String deptId);
+
+	/**
+	 * 计算保安人员年龄
+	 * @param userId
+	 * @return
+	 */
+	UserVO getUserAgeById(@Param("userId") Long userId);
+
+	List<Map<String, Object>> selectUser();
+
+
+	/**
+	 * 派遣人员
+	 * @param deptid
+	 * @param jurisdiction
+	 * @return
+	 */
+	List<Map<String, Object>> getDispaterInfo(@Param("deptid")String deptid,
+									@Param("jurisdiction")String jurisdiction);
+
+	/**
+	 * 工作汇报人员
+	 * @param deptid
+	 * @param jurisdiction
+	 * @return
+	 */
+	List<Map<String, Object>> getWorkReportInfo(@Param("type")String type,
+												@Param("deptid")String deptid,
+												@Param("jurisdiction")String jurisdiction);
+
+	/**
+	 * 工作汇报人员(向民警)
+	 * @param deptid
+	 * @param jurisdiction
+	 * @return
+	 */
+	List<Map<String, Object>> getWorkReportInfos(@Param("type")String type,
+												@Param("deptid")String deptid,
+												@Param("jurisdiction")String jurisdiction);
+
+	/**
+	 * 根据保安员编码查询保安信息
+	 * @param securityNumber 保安证编码
+	 * @return
+	 */
+    UserVO getUserInfoBySecurityNumber(@Param("securityNumber") String securityNumber);
+
+	/**
+	 * 保安员信息
+	 * @param user
+	 * @return
+	 */
+    UserVO getUserDetails(@Param("user") User user);
+
+
+	DispatcherVO getDispatcherInfoByUserId(Long userId);
+
+	/**
+	 * 查询账号相同的用户数量
+	 * @param account
+	 * @return
+	 */
+    Integer selectCountAccount(@Param("account") String account);
 }

--
Gitblit v1.9.3