From 8b375fe00a241b3a769b82fe3dac8d1c9dce8a02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 14:36:07 +0800
Subject: [PATCH] 模拟考试修改

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.java |  101 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 98 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 afcf10c..06d23ff 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,9 @@
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.modules.dispatcher.vo.DispatcherVO;
+import org.springblade.modules.experience.entity.Experience;
+import org.springblade.modules.system.excel.ExportSecurityExcel;
+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,11 +46,20 @@
 	 *
 	 * @param page
 	 * @param user
-	 * @param deptIdList
-	 * @param tenantId
 	 * @return
 	 */
+	@SqlParser(filter = true)
 	List<UserVO> selectUserPages(IPage<UserVO> page, @Param("user") UserVO user);
+
+	/**
+	 * 自定义分页，带坐标
+	 *
+	 * @param page
+	 * @param user
+	 * @return
+	 */
+	@SqlParser(filter = true)
+	List<UserVO> selectUserPagesByAge(IPage<UserVO> page, @Param("user") UserVO user);
 
 
 	/**
@@ -108,6 +120,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);
 
 	/**
@@ -166,7 +188,7 @@
 	 * @param securityNumber 保安证编码
 	 * @return
 	 */
-    UserVO getUserInfoBySecurityNumber(@Param("securityNumber") String securityNumber);
+    UserVO getUserInfoBySecurityNumber(@Param("securityNumber") String securityNumber,@Param("cardid") String cardid);
 
 	/**
 	 * 保安员信息
@@ -192,4 +214,77 @@
 	 */
 	@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<ExportSecurityExcel> exportSecurityInfo(@Param("user") UserVO user);
+	/**
+	 * 查询押运人员编码不为null的保安信息
+	 * @return
+	 */
+	List<Map<String, Object>> selectEquipent();
+
+	/**
+	 * 查詢派遣信息
+	 * @param id 用戶id
+	 * @return
+	 */
+	DispatcherVO getUserDispatcherInfo(Long id);
+
+	/**
+	 * 用户批量导入
+	 * @param userList
+	 */
+    void batchUserList(@Param("list") List<User> userList);
+
+	/**
+	 * 从业记录批量导入
+	 * @param experienceList
+	 */
+	void batchExperienceList(@Param("list") List<Experience> experienceList);
+
+	/**
+	 * 年龄分布查询
+	 * @return
+	 */
+	List<Integer> getAgeStatistics(@Param("user") UserVO user);
+
+	/**
+	 * 根据用户 id 查询用户信息
+	 * @param id
+	 * @return
+	 */
+    User getUserById(long id);
+
+	/**
+	 * 手动新增用户信息
+	 * @param user
+	 * @return
+	 */
+    int insertUser(@Param("user") User user);
+
+	/**
+	 * 批量更新用户信息
+	 * @param updateList
+	 * @return
+	 */
+	@SqlParser(filter = true)
+	void batchUpdateUserList(@Param("list") List<User> updateList);
 }

--
Gitblit v1.9.3