From 1686e242b0c63d64db8551fe9d08cd57bd77fb8b Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 16 Aug 2021 19:21:22 +0800
Subject: [PATCH] 1.许可审批

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 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 e52968a..70693e6 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -31,6 +31,7 @@
 import org.springblade.modules.system.vo.UserVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 服务类
@@ -72,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);
 
 	/**
 	 * 自定义分页
@@ -241,4 +253,21 @@
 	 * @return
 	 */
 	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);
 }

--
Gitblit v1.9.3