From f2032d8331cd8939bb8dd4ef372033a2dcdbc850 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Thu, 17 Feb 2022 16:10:55 +0800
Subject: [PATCH] +添加法人变更，以及跨区域备案字段更改

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 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 7d45fbd..dd66bee 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -18,6 +18,7 @@
 
 
 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;
@@ -26,6 +27,7 @@
 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;
@@ -293,6 +295,14 @@
 	void importSecurity(List<SecurityExcel> data, Boolean isCovered, String deptId);
 
 	/**
+	 * 押运人员导入
+	 * @param data
+	 * @param isCovered
+	 * @param deptId
+	 */
+	void importSecurityYy(List<SecurityYyExcel> data, Boolean isCovered, String deptId);
+
+	/**
 	 * 根据保安员编码查询保安信息
 	 * @param securityNumber 保安证编码
 	 * @return
@@ -336,4 +346,32 @@
 	 * @return
 	 */
 	Integer selectCountAccount(String account);
+
+	/**
+	 * 保安员信息导出
+	 * @param user
+	 * @return
+	 */
+    List<SecurityExcel> exportSecurityInfo(UserVO user);
+
+	/**
+	 * 导入保安员test
+	 * @param data
+	 * @param isCovered
+	 * @param deptId
+	 */
+	void importSecurityTest(List<SecurityExcel> data, Boolean isCovered, String deptId);
+	/**
+	 * 查询押运人员编码不为null的保安信息
+	 * @return
+	 */
+	List<Map<String, Object>> selectEquipent();
+
+	/**
+	 * 年龄分布查询
+	 * @param user
+	 * @return
+	 */
+	Object getAgeStatistics(UserVO user);
+
 }

--
Gitblit v1.9.3