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/impl/UserServiceImpl.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index b42672c..1cb2729 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -138,7 +138,13 @@
}
@Override
- public IPage<UserVO> selectUserPage(IPage<UserVO> page, User user, Long deptId, String tenantId) {
+ public IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user, Long deptId, String tenantId) {
+ List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+ return page.setRecords(baseMapper.selectUserPages(page, user, deptIdList, tenantId));
+ }
+
+ @Override
+ public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
}
@@ -497,4 +503,24 @@
public int getSecurityPaperCount(String pre) {
return baseMapper.getSecurityPaperCount(pre);
}
+
+ /**
+ * 查询当前公司未持证保安没有报名的人员
+ * @param deptId
+ * @return
+ */
+ @Override
+ public List<User> getNotApplyIdList(String deptId) {
+ return baseMapper.getNotApplyIdList(deptId);
+ }
+
+ /**
+ * 计算保安人员年龄
+ * @param userId
+ * @return
+ */
+ @Override
+ public UserVO getUserAgeById(Long userId) {
+ return baseMapper.getUserAgeById(userId);
+ }
}
--
Gitblit v1.9.3