From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 62 ++++++++++++++++++++++++++++++
1 files changed, 61 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 d991869..c21562f 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -16,14 +16,19 @@
*/
package org.springblade.modules.system.mapper;
+import com.baomidou.mybatisplus.annotation.SqlParser;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.node.TreeNode;
+import org.springblade.modules.system.vo.UserVO;
import java.util.List;
+import java.util.Map;
/**
* Mapper 接口
@@ -31,6 +36,18 @@
* @author Chill
*/
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);
+
/**
* 自定义分页
@@ -70,5 +87,48 @@
/**
* 自定义用户列表(只有保安员)
*/
- List<User> selectUserPageSecurity(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+ List<User> selectUserPageSecurity(IPage<User> page, @Param("user") User user);
+
+ /**
+ * 保安员列表，帅选无保安证
+ * @param page
+ * @param user
+ * @return
+ */
+ IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page,@Param("user") UserVO user);
+
+ /**
+ * 保安员列表树 安员列表树，帅选无保安证,下拉tree
+ * @param user 用户信息
+ * @return
+ */
+ @MapKey(value = "id")
+ @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);
+
+ /**
+ * 计算保安人员年龄
+ * @param userId
+ * @return
+ */
+ UserVO getUserAgeById(@Param("userId") Long userId);
+
+ List<Map<String, Object>> selectUser();
}
--
Gitblit v1.9.3