From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改，保安证编码生成修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 53 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 97aafd8..e03bbcc 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -22,6 +22,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
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.UserExcel;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.node.TreeNode;
@@ -46,7 +47,7 @@
* @param tenantId
* @return
*/
- List<UserVO> selectUserPages(IPage<UserVO> page, @Param("user") UserVO user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+ List<UserVO> selectUserPages(IPage<UserVO> page, @Param("user") UserVO user);
/**
@@ -87,16 +88,15 @@
/**
* 自定义用户列表(只有保安员)
*/
- 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
- * @param tenantId
* @return
*/
- IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page,@Param("user") UserVO user, @Param("deptIdList")List<Long> deptIdList, @Param("tenantId") String tenantId);
+ IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page,@Param("user") UserVO user);
/**
* 保安员列表树 安员列表树，帅选无保安证,下拉tree
@@ -106,6 +106,8 @@
@MapKey(value = "id")
@SqlParser(filter=true)
Map<Long, TreeNode> getSecurityApplyTree(@Param("user") UserVO user);
+
+
List<Map<Object,Object>> selectInr(String deptid);
/**
@@ -128,4 +130,51 @@
* @return
*/
UserVO getUserAgeById(@Param("userId") Long userId);
+
+ List<Map<String, Object>> selectUser();
+
+
+ /**
+ * 派遣人员
+ * @param deptid
+ * @param jurisdiction
+ * @return
+ */
+ List<Map<String, Object>> getDispaterInfo(@Param("deptid")String deptid,
+ @Param("jurisdiction")String jurisdiction);
+
+ /**
+ * 工作汇报人员
+ * @param deptid
+ * @param jurisdiction
+ * @return
+ */
+ List<Map<String, Object>> getWorkReportInfo(@Param("type")String type,
+ @Param("deptid")String deptid,
+ @Param("jurisdiction")String jurisdiction); /**
+ * 工作汇报人员(向民警)
+ * @param deptid
+ * @param jurisdiction
+ * @return
+ */
+ List<Map<String, Object>> getWorkReportInfos(@Param("type")String type,
+ @Param("deptid")String deptid,
+ @Param("jurisdiction")String jurisdiction);
+
+ /**
+ * 根据保安员编码查询保安信息
+ * @param securityNumber 保安证编码
+ * @return
+ */
+ UserVO getUserInfoBySecurityNumber(@Param("securityNumber") String securityNumber);
+
+ /**
+ * 保安员信息
+ * @param user
+ * @return
+ */
+ UserVO getUserDetails(@Param("user") User user);
+
+
+ DispatcherVO getDispatcherInfoByUserId(Long userId);
}
--
Gitblit v1.9.3