From 7c2c09439da3dccf1e032e89e1cb950b8fa1cc26 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 01 Mar 2022 20:09:57 +0800
Subject: [PATCH] 健康证，合同基础接口编写

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |   44 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 43 insertions(+), 1 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 2a7f4d7..f52a7a3 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -18,8 +18,10 @@
 
 
 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.core.tool.api.R;
 import org.springblade.modules.auth.enums.UserEnum;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.entity.UserInfo;
@@ -292,6 +294,13 @@
 	 * @param isCovered
 	 */
 	void importSecurity(List<SecurityExcel> data, Boolean isCovered, String deptId);
+
+	/**
+	 * 押运人员导入
+	 * @param data
+	 * @param isCovered
+	 * @param deptId
+	 */
 	void importSecurityYy(List<SecurityYyExcel> data, Boolean isCovered, String deptId);
 
 	/**
@@ -299,7 +308,7 @@
 	 * @param securityNumber 保安证编码
 	 * @return
 	 */
-    UserVO getUserInfoBySecurityNumber(String securityNumber);
+    UserVO getUserInfoBySecurityNumber(String securityNumber,String cardid);
 
 	/**
 	 * 保安员信息
@@ -338,4 +347,37 @@
 	 * @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);
+
+	/**
+	 * 查询登录密码还是 123456 的单位信息
+	 * @return
+	 */
+    Object getNotUpdatePwdInfo();
 }

--
Gitblit v1.9.3