From ddebcfaf85cbb400668f38b1efd82e439c6e1012 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 13 Aug 2021 08:39:43 +0800
Subject: [PATCH] 报名考试接口修改
---
src/main/java/org/springblade/modules/system/service/IUserService.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 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 7938aa7..9e19a09 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
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;
@@ -26,9 +27,11 @@
import org.springblade.modules.system.entity.UserInfo;
import org.springblade.modules.system.entity.UserOauth;
import org.springblade.modules.system.excel.UserExcel;
+import org.springblade.modules.system.node.TreeNode;
import org.springblade.modules.system.vo.UserVO;
import java.util.List;
+import java.util.Map;
/**
* 服务类
@@ -70,7 +73,7 @@
* @param tenantId
* @return
*/
- IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId);
+ IPage<UserVO> selectUserPage(IPage<UserVO> page, User user, Long deptId, String tenantId);
/**
* 自定义分页
@@ -178,7 +181,7 @@
* @param queryWrapper
* @return
*/
- List<UserExcel> exportUser(Wrapper<User> queryWrapper);
+ //List<UserExcel> exportUser(Wrapper<User> queryWrapper);
/**
* 注册用户
@@ -213,4 +216,40 @@
* @return
*/
User getUserInfoByIdCardNo(String idCardNo);
+ /**
+ * 自定义用户列表(只有保安员)
+ */
+ IPage<User> selectUserPageSecurity(IPage<User> page, User user, Long deptId, String s);
+
+ /**
+ * 自定义用户列表(只有保安员),根据保安员查
+ */
+ List<User> selectUserPageSecurityUnit(IPage<User> page, User user, Long deptId, String s);
+
+ /**
+ * 保安员列表，帅选无保安证
+ * @param page
+ * @param user
+ * @param deptId
+ * @param s
+ * @return
+ */
+ IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page, UserVO user, Long deptId, String s);
+
+ /**
+ * 保安员列表树 安员列表树，帅选无保安证,下拉tree
+ * @param user 用户信息
+ * @return
+ */
+ List<TreeNode> getSecurityApplyTree(UserVO user);
+
+ List<Map<Object,Object>> selectInr(String deptid);
+
+
+ /**
+ * 查询当前年份已有的保安证编号
+ * @param pre 前缀
+ * @return
+ */
+ int getSecurityPaperCount(String pre);
}
--
Gitblit v1.9.3