From b5960d1968e007b91d4d33dd7cbb74f1b566f2c1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 10:20:01 +0800
Subject: [PATCH] 到期时间修改

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.java |   45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 44 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 4d05c0a..febcd78 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -22,12 +22,14 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
+import org.springblade.modules.system.excel.SecurityExcel;
 import org.springblade.modules.system.excel.UserExcel;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.vo.UserVO;
 import org.springframework.boot.autoconfigure.quartz.QuartzDataSource;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Mapper 接口
@@ -71,11 +73,52 @@
 	 * 自定义用户列表(只有保安员)
 	 */
 	@SqlParser(filter = true)
-    List<UserVO> selectUserPageSecurity(IPage<UserVO> page, @Param("user") UserVO user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+    List<UserVO> selectUserPageSecurity(IPage<UserVO> page, @Param("user") UserVO user);
 
 	/**
 	 * 查询所有未注销用户
 	 * @return
 	 */
 	List<User> getAllUserList();
+
+	/**
+	 * 查询用户数据,未删除的,未审核的
+	 * @return
+	 */
+	List<User> getNotAuditAllUserList();
+
+	/**
+	 * 自定义列表,...
+	 * @param page
+	 * @param user
+	 * @return
+	 */
+	List<User> selectUserPages(IPage<User> page,@Param("user") User user);
+
+	/**
+	 * 根据保安员编码查询保安员信息
+	 * @param securityNumber
+	 * @return
+	 */
+    UserVO getUserInfoBySecurityNumber(@Param("securityNumber") String securityNumber);
+
+	/**
+	 * 导出用户审查明细
+	 * @param user
+	 * @return
+	 */
+    List<SecurityExcel> exportSecurity(@Param("user") UserVO user);
+	/**
+	 * 查询押运人员编码不为null的保安信息
+	 * @return
+	 */
+	List selectPeo(@Param("user") UserVO user);
+
+	/**
+	 * 查询当前部门名称及父级部门名称
+	 * @param deptId 部门名称
+	 * @return
+	 */
+	@SqlParser(filter = true)
+	List<String> getDeptName(@Param("deptId") String deptId);
 }

--
Gitblit v1.9.3