From 4d3856e802d5c9d28d8654f35da426bdb517d7d4 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Mon, 21 Jun 2021 10:32:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/service/SysUserService.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserService.java b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
index 329a102..861ba03 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
@@ -16,6 +16,8 @@
List<SysUser> getSysUserList(String arp, String name,String departmentName,String project,String company,Integer first, Integer pageSize);
int getSysUserTotalCount(String arp, String name,String departmentName,String project,String company);
+ int getUserCountInProject(String arp, String name,String departmentName,String project,String company);
+ List<SysUser> getUserInProject(String arp, String name,String departmentName,String project,String company,Integer first, Integer pageSize);
SysUser getSysUser(String id);
SysUser getSysUserForSuppllier(String id);
SysUser getSysUserByAccount(String account);
@@ -35,7 +37,7 @@
public int insertSysUserList(List<SysUser> userList);
- Map getUser(String id);
+ SysUser getUser(String id);
void updateUserFavor(SysReagent reagent, SysUser user) throws Exception;
@@ -46,4 +48,11 @@
List<LaboratoryVo.LaboratoryUser> getUserByProject(String project);
List<SysUser> getUserByArp(String arp);
+
+ List<Map> getExportUserList(String arp, String name, String departmentName, String project, String company);
+
+ void exportUser2Excel(List<Map> list)throws Exception;
+
+ List<String> getLibrarianEmail();
+
}
--
Gitblit v1.9.2