From afc2b4d2800d91c793523d14fbe2d6fbbd319fc0 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Fri, 25 Feb 2022 09:02:41 +0800
Subject: [PATCH] 模拟考试开始修改,返回所有题目的所有答题信息

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.java |   44 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 43 insertions(+), 1 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 15166d4..37f21f2 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.experience.entity.Experience;
 import org.springblade.modules.system.excel.SecurityExcel;
 import org.springblade.modules.system.excel.UserExcel;
 import org.springblade.modules.system.entity.User;
@@ -46,7 +47,18 @@
 	 * @param user
 	 * @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);
 
 
 	/**
@@ -175,7 +187,7 @@
 	 * @param securityNumber 保安证编码
 	 * @return
 	 */
-    UserVO getUserInfoBySecurityNumber(@Param("securityNumber") String securityNumber);
+    UserVO getUserInfoBySecurityNumber(@Param("securityNumber") String securityNumber,@Param("cardid") String cardid);
 
 	/**
 	 * 保安员信息
@@ -222,4 +234,34 @@
 	 * @return
 	 */
 	List<SecurityExcel> 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);
 }

--
Gitblit v1.9.3