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/service/IUserService.java |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 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 f7b43b1..b723a26 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -73,7 +73,18 @@
 	 * @param tenantId
 	 * @return
 	 */
-	IPage<UserVO> selectUserPage(IPage<UserVO> page, User user, Long deptId, String tenantId);
+	IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user, Long deptId, String tenantId);
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param user
+	 * @param deptId
+	 * @param tenantId
+	 * @return
+	 */
+	IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId);
 
 	/**
 	 * 自定义分页
@@ -244,4 +255,26 @@
 	List<TreeNode> getSecurityApplyTree(UserVO user);
 
 	List<Map<Object,Object>> selectInr(String deptid);
+
+
+	/**
+	 * 查询当前年份已有的保安证编号
+	 * @param pre 前缀
+	 * @return
+	 */
+	int getSecurityPaperCount(String pre);
+
+	/**
+	 * 查询当前公司未持证保安没有报名的人员
+	 * @param deptId
+	 * @return
+	 */
+    List<User> getNotApplyIdList(String deptId);
+
+	/**
+	 * 计算保安人员年龄
+	 * @param userId
+	 * @return
+	 */
+	UserVO getUserAgeById(Long userId);
 }

--
Gitblit v1.9.3