From 7293f04d18fb2e882e152f962c3aa1d8fcb1f93e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 17 Nov 2021 15:46:35 +0800
Subject: [PATCH] 证书打印信息导出修改
---
src/main/java/org/springblade/modules/system/service/IUserService.java | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 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 2ae7039..2a7f4d7 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,16 @@
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.SecurityExcel;
+import org.springblade.modules.system.excel.SecurityYyExcel;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.node.TreeNode;
import org.springblade.modules.system.vo.UserVO;
@@ -82,7 +83,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 +183,7 @@
* @param isCovered
* @return
*/
- void importUser(List<UserExcel> data, Boolean isCovered);
+ void importUser(List<UserExcel> data, Boolean isCovered,String deptId);
/**
* 导出用户数据
@@ -252,6 +253,13 @@
*/
List<TreeNode> getSecurityApplyTree(UserVO user);
+ /**
+ * 保安员列表树 安员列表树，帅选无保安证,下拉tree
+ * @param user 用户信息
+ * @return
+ */
+ List<TreeNode> getSecurityDispatcherTree(UserVO user);
+
List<Map<Object,Object>> selectInr(String deptid);
@@ -283,7 +291,8 @@
* @param data
* @param isCovered
*/
- void importSecurity(List<UserExcel> data, Boolean isCovered);
+ void importSecurity(List<SecurityExcel> data, Boolean isCovered, String deptId);
+ void importSecurityYy(List<SecurityYyExcel> data, Boolean isCovered, String deptId);
/**
* 根据保安员编码查询保安信息
@@ -298,4 +307,35 @@
* @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);
+
+
+ /**
+ * 根据用户账户查询用户是否存在
+ * @param account
+ * @return
+ */
+ Integer selectCountAccount(String account);
}
--
Gitblit v1.9.3