From dca2532f01dac86be25ad09fa9ee8035bccdca6a Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 27 Nov 2021 17:11:33 +0800
Subject: [PATCH] 1.部门tree修改 2.用户查询修改 3.培训报名年龄拦截
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 80 insertions(+), 3 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 14be28f..15166d4 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,8 @@
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.SecurityExcel;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.node.TreeNode;
@@ -42,8 +44,6 @@
*
* @param page
* @param user
- * @param deptIdList
- * @param tenantId
* @return
*/
List<UserVO> selectUserPages(IPage<UserVO> page, @Param("user") UserVO user);
@@ -58,7 +58,7 @@
* @param tenantId
* @return
*/
- List<User> selectUserPage(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+ List<UserVO> selectUserPage(IPage<UserVO> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
/**
* 获取用户
@@ -107,6 +107,16 @@
Map<Long, TreeNode> getSecurityApplyTree(@Param("user") UserVO user);
+ /**
+ * 派遣保安员列表树 安员列表树，帅选无保安证,下拉tree
+ * @param user 用户信息
+ * @return
+ */
+ @MapKey(value = "id")
+ @SqlParser(filter=true)
+ Map<Long, TreeNode> getSecurityDispatcherTree(@Param("user") UserVO user);
+
+
List<Map<Object,Object>> selectInr(String deptid);
/**
@@ -132,6 +142,34 @@
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 保安证编码
@@ -145,4 +183,43 @@
* @return
*/
UserVO getUserDetails(@Param("user") User user);
+
+
+ DispatcherVO getDispatcherInfoByUserId(Long userId);
+
+ /**
+ * 查询账号相同的用户数量
+ * @param account
+ * @return
+ */
+ Integer selectCountAccount(@Param("account") String account);
+
+ /**
+ * 查询当前部门名称及父级部门名称
+ * @param deptId 部门名称
+ * @return
+ */
+ @SqlParser(filter = true)
+ List<String> getDeptName(@Param("deptId") String deptId);
+
+ /**
+ * 查询用户表中未删除，未离职的用户信息
+ * @param username
+ * @return
+ */
+ User getUserInfo(@Param("account") String username);
+
+ /**
+ * 现场检查获取保安员
+ * @param jurisdiction
+ * @return
+ */
+ List<Map<String, Object>> getSecurityInfo(@Param("jurisdiction")String jurisdiction);
+
+ /**
+ * 导出保安员信息
+ * @param user
+ * @return
+ */
+ List<SecurityExcel> exportSecurityInfo(@Param("user") UserVO user);
}
--
Gitblit v1.9.3