From 6ee55849eac9cd9d9183d155e80ebd454115a0c3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 17 Aug 2021 10:28:11 +0800
Subject: [PATCH] 根据userID 查詢年齡,分數計算修改,年齡大於50岁的理论30%,实操70%,小于50岁的总分按理论实操各50%计算

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.java |   36 +++++++++++++++++++++++++++++++++++-
 1 files changed, 35 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 4183020..97aafd8 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -38,6 +38,18 @@
 public interface UserMapper extends BaseMapper<User> {
 
 	/**
+	 * 自定义分页,带坐标
+	 *
+	 * @param page
+	 * @param user
+	 * @param deptIdList
+	 * @param tenantId
+	 * @return
+	 */
+	List<UserVO> selectUserPages(IPage<UserVO> page, @Param("user") UserVO user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+
+
+	/**
 	 * 自定义分页
 	 *
 	 * @param page
@@ -46,7 +58,7 @@
 	 * @param tenantId
 	 * @return
 	 */
-	List<UserVO> selectUserPage(IPage<UserVO> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+	List<User> selectUserPage(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
 
 	/**
 	 * 获取用户
@@ -94,4 +106,26 @@
 	@MapKey(value = "id")
 	@SqlParser(filter=true)
 	Map<Long, TreeNode> getSecurityApplyTree(@Param("user") UserVO user);
+	List<Map<Object,Object>> selectInr(String deptid);
+
+	/**
+	 * 查询当前年份已有的保安证编号
+	 * @param pre 前缀
+	 * @return
+	 */
+	int getSecurityPaperCount(@Param("pre") String pre);
+
+	/**
+	 * 查询当前公司未持证保安没有报名的人员
+	 * @param deptId
+	 * @return
+	 */
+    List<User> getNotApplyIdList(@Param("deptId")String deptId);
+
+	/**
+	 * 计算保安人员年龄
+	 * @param userId
+	 * @return
+	 */
+	UserVO getUserAgeById(@Param("userId") Long userId);
 }

--
Gitblit v1.9.3