From 6b7dfddb2325267574e84b375b9147a8b2c2bc02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Sep 2021 15:56:17 +0800
Subject: [PATCH] 新增考试缴费凭证批量上传
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 46 insertions(+), 5 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 309a5a8..b6e9c08 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
@@ -423,8 +423,8 @@
}
@Override
- public void updateUser(String hold, String cardid) {
- baseMapper.updateUser(hold, cardid);
+ public void updateUser(String hold, String cardid,String holdv,String time) {
+ baseMapper.updateUser(hold, cardid,holdv,time);
}
@@ -432,9 +432,8 @@
* 自定义用户列表(只有保安员)
*/
@Override
- public IPage<UserVO> selectUserPageSecurity(IPage<UserVO> page, UserVO user, Long deptId, String tenantId) {
- List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
- return page.setRecords(baseMapper.selectUserPageSecurity(page, user, deptIdList, tenantId));
+ public IPage<UserVO> selectUserPageSecurity(IPage<UserVO> page, UserVO user) {
+ return page.setRecords(baseMapper.selectUserPageSecurity(page, user));
}
/**
@@ -445,4 +444,46 @@
public List<User> getAllUserList() {
return baseMapper.getAllUserList();
}
+
+ /**
+ * 查询用户数据,未删除的,未审核的
+ * @return
+ */
+ @Override
+ public List<User> getNotAuditAllUserList() {
+ return baseMapper.getNotAuditAllUserList();
+ }
+
+ /**
+ * 自定义列表，...
+ * @param page
+ * @param user
+ * @return
+ */
+ @Override
+ public IPage<User> selectUserPages(IPage<User> page, User user) {
+ return page.setRecords(baseMapper.selectUserPages(page, user));
+ }
+
+ /**
+ * 根据保安员编码查询保安员信息
+ * @param securityNumber
+ * @return
+ */
+ @Override
+ public UserVO getUserInfoBySecurityNumber(String securityNumber) {
+ return baseMapper.getUserInfoBySecurityNumber(securityNumber);
+ }
+
+
+ /**
+ * 通过 身份证号查询用户信息
+ *
+ * @param idCardNo 身份证号
+ * @return
+ */
+ @Override
+ public User getUserInfoByIdCardNo(String idCardNo) {
+ return baseMapper.getUserInfoByIdCardNo(idCardNo);
+ }
}
--
Gitblit v1.9.3