From d47e5818d63bef779ff8c4cef79382ae63e99fb4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 15 Dec 2021 16:30:28 +0800
Subject: [PATCH] 二维码生成修改，保安员证信息查询修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 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 afcf10c..61637ce 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -23,6 +23,7 @@
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;
@@ -43,8 +44,6 @@
*
* @param page
* @param user
- * @param deptIdList
- * @param tenantId
* @return
*/
List<UserVO> selectUserPages(IPage<UserVO> page, @Param("user") UserVO user);
@@ -106,6 +105,16 @@
@MapKey(value = "id")
@SqlParser(filter=true)
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);
@@ -192,4 +201,37 @@
*/
@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);
+ /**
+ * 查询押运人员编码不为null的保安信息
+ * @return
+ */
+ List<Map<String, Object>> selectEquipent();
+
+ /**
+ * 查詢派遣信息
+ * @param id 用戶id
+ * @return
+ */
+ DispatcherVO getUserDispatcherInfo(Long id);
}
--
Gitblit v1.9.3