From d4cb6034a5e05b7aa2fb4593f4c2b630be138ca1 Mon Sep 17 00:00:00 2001 From: Administrator <admin> Date: Mon, 08 Nov 2021 19:43:58 +0800 Subject: [PATCH] 1.派遣批量新增,导入示例新增 2.社保缴纳修改,导入示例新增 --- src/main/java/org/springblade/modules/system/service/IUserService.java | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 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 a2f9939..d454fc0 100644 --- a/src/main/java/org/springblade/modules/system/service/IUserService.java +++ b/src/main/java/org/springblade/modules/system/service/IUserService.java @@ -17,22 +17,17 @@ 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.exam.vo.ExamScoreVO; 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.ExportSecurityPaperExcel; import org.springblade.modules.system.excel.QrCodeExcel; import org.springblade.modules.system.excel.UserExcel; import org.springblade.modules.system.node.TreeNode; import org.springblade.modules.system.vo.UserVO; -import org.springblade.modules.zc.entity.Zc; import java.util.List; import java.util.Map; @@ -256,6 +251,13 @@ */ List<TreeNode> getSecurityApplyTree(UserVO user); + /** + * 保安员列表树 安员列表树,帅选无保安证,下拉tree + * @param user 用户信息 + * @return + */ + List<TreeNode> getSecurityDispatcherTree(UserVO user); + List<Map<Object,Object>> selectInr(String deptid); @@ -326,10 +328,5 @@ */ void importQrCode(List<QrCodeExcel> data, Boolean isCovered, String deptId); - /** - * 导出保安员证信息 - * @param user - * @return - */ - List<ExportSecurityPaperExcel> exportSecurityPaperList(UserVO user); + } -- Gitblit v1.9.3