From 8e8c3113eea4c29a6c5a23ca35c4d460e81f3465 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Thu, 24 Feb 2022 09:47:03 +0800
Subject: [PATCH] 暂停模拟考试后,继续考试修改,状态修改为考试中,题目查询按本次模拟考试题目排序,接口放行

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |   38 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 37 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index 2a7f4d7..128f206 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -18,6 +18,7 @@
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 import org.springblade.modules.auth.enums.UserEnum;
@@ -292,6 +293,13 @@
 	 * @param isCovered
 	 */
 	void importSecurity(List<SecurityExcel> data, Boolean isCovered, String deptId);
+
+	/**
+	 * 押运人员导入
+	 * @param data
+	 * @param isCovered
+	 * @param deptId
+	 */
 	void importSecurityYy(List<SecurityYyExcel> data, Boolean isCovered, String deptId);
 
 	/**
@@ -299,7 +307,7 @@
 	 * @param securityNumber 保安证编码
 	 * @return
 	 */
-    UserVO getUserInfoBySecurityNumber(String securityNumber);
+    UserVO getUserInfoBySecurityNumber(String securityNumber,String cardid);
 
 	/**
 	 * 保安员信息
@@ -338,4 +346,32 @@
 	 * @return
 	 */
 	Integer selectCountAccount(String account);
+
+	/**
+	 * 保安员信息导出
+	 * @param user
+	 * @return
+	 */
+    List<SecurityExcel> exportSecurityInfo(UserVO user);
+
+	/**
+	 * 导入保安员test
+	 * @param data
+	 * @param isCovered
+	 * @param deptId
+	 */
+	void importSecurityTest(List<SecurityExcel> data, Boolean isCovered, String deptId);
+	/**
+	 * 查询押运人员编码不为null的保安信息
+	 * @return
+	 */
+	List<Map<String, Object>> selectEquipent();
+
+	/**
+	 * 年龄分布查询
+	 * @param user
+	 * @return
+	 */
+	Object getAgeStatistics(UserVO user);
+
 }

--
Gitblit v1.9.3