From 3851bbe241d3f5caa9b208d6740b94f6d537b5c2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 29 Nov 2021 11:30:52 +0800
Subject: [PATCH] 1.押运人员编码查询
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 3e59148..d5e20bc 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -23,6 +23,7 @@
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
+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.node.TreeNode;
@@ -43,8 +44,6 @@
*
* @param page
* @param user
- * @param deptIdList
- * @param tenantId
* @return
*/
List<UserVO> selectUserPages(IPage<UserVO> page, @Param("user") UserVO user);
@@ -218,9 +217,14 @@
List<Map<String, Object>> getSecurityInfo(@Param("jurisdiction")String jurisdiction);
/**
- * 导出保安员证信息
+ * 导出保安员信息
* @param user
* @return
*/
- List<UserVO> exportSecurityPaperList(@Param("user") UserVO user);
+ List<SecurityExcel> exportSecurityInfo(@Param("user") UserVO user);
+ /**
+ * 查询押运人员编码不为null的保安信息
+ * @return
+ */
+ List<Map<String, Object>> selectEquipent();
}
--
Gitblit v1.9.3