From e810bb568064ff87f0462daafe86e4c39579647b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 16 Aug 2021 19:38:48 +0800
Subject: [PATCH] 1.工作汇报查询修改 2.考试成绩查询接口修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index e0fb999..bb2fdfe 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -38,6 +38,18 @@
public interface UserMapper extends BaseMapper<User> {
/**
+ * 自定义分页，带坐标
+ *
+ * @param page
+ * @param user
+ * @param deptIdList
+ * @param tenantId
+ * @return
+ */
+ List<UserVO> selectUserPages(IPage<UserVO> page, @Param("user") UserVO user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+
+
+ /**
* 自定义分页
*
* @param page
@@ -46,7 +58,7 @@
* @param tenantId
* @return
*/
- List<UserVO> selectUserPage(IPage<UserVO> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+ List<User> selectUserPage(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
/**
* 获取用户
@@ -95,4 +107,18 @@
@SqlParser(filter=true)
Map<Long, TreeNode> getSecurityApplyTree(@Param("user") UserVO user);
List<Map<Object,Object>> selectInr(String deptid);
+
+ /**
+ * 查询当前年份已有的保安证编号
+ * @param pre 前缀
+ * @return
+ */
+ int getSecurityPaperCount(@Param("pre") String pre);
+
+ /**
+ * 查询当前公司未持证保安没有报名的人员
+ * @param deptId
+ * @return
+ */
+ List<User> getNotApplyIdList(@Param("deptId")String deptId);
}
--
Gitblit v1.9.3