From 247abfbc0b322a04f8dc5fcf01fe7989b25fd7e9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 04 Nov 2021 10:35:29 +0800
Subject: [PATCH] 保安员发证时间更新接口新增

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |   53 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 49 insertions(+), 4 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 75d7b26..fdb0244 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -17,15 +17,14 @@
 package org.springblade.modules.system.service;
 
 
-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;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.entity.UserInfo;
 import org.springblade.modules.system.entity.UserOauth;
+import org.springblade.modules.system.excel.QrCodeExcel;
 import org.springblade.modules.system.excel.UserExcel;
 import org.springblade.modules.system.node.TreeNode;
 import org.springblade.modules.system.vo.UserVO;
@@ -82,7 +81,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);
 
 	/**
 	 * 自定义分页
@@ -182,7 +181,7 @@
 	 * @param isCovered
 	 * @return
 	 */
-	void importUser(List<UserExcel> data, Boolean isCovered);
+	void importUser(List<UserExcel> data, Boolean isCovered,String deptId);
 
 	/**
 	 * 导出用户数据
@@ -277,4 +276,50 @@
 	UserVO getUserAgeById(Long userId);
 
 	List<Map<String, Object>> selectUser();
+
+	/**
+	 * 导入保安员
+	 * @param data
+	 * @param isCovered
+	 */
+	void importSecurity(List<UserExcel> data, Boolean isCovered);
+
+	/**
+	 * 根据保安员编码查询保安信息
+	 * @param securityNumber 保安证编码
+	 * @return
+	 */
+    UserVO getUserInfoBySecurityNumber(String securityNumber);
+
+	/**
+	 * 保安员信息
+	 * @param user
+	 * @return
+	 */
+    UserVO getUserDetails(User user);
+	List<Map<String, Object>> seleL(String type,String deptid,String jurisdiction,Long userId);
+
+	/**
+	 * 查询账号相同的用户数量
+	 * @param account
+	 * @return
+	 */
+	Integer selectCount(String account);
+
+	/**
+	 * 查询用户表中未删除，未离职的用户信息
+	 * @param username
+	 * @return
+	 */
+	User getUserInfo(String username);
+
+	/**
+	 * 生成二维码
+	 * @param data
+	 * @param isCovered
+	 * @param deptId
+	 */
+	void importQrCode(List<QrCodeExcel> data, Boolean isCovered, String deptId);
+
+
 }

--
Gitblit v1.9.3