From ea2b42d0ab6cd96118ddb030bbc3901149d6aaa7 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Wed, 27 Oct 2021 16:59:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/service/SysUserService.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserService.java b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
index 9d8ce1b..2a649fe 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
@@ -2,6 +2,8 @@
import com.nanometer.smartlab.entity.SysReagent;
import com.nanometer.smartlab.entity.SysUser;
+import com.nanometer.smartlab.entity.dto.HazardousWasteUser;
+import com.nanometer.smartlab.entity.dto.LaboratoryVo;
import com.nanometer.smartlab.entity.dto.SysUserDto;
import java.util.List;
@@ -12,15 +14,17 @@
*/
public interface SysUserService {
- List<SysUser> getSysUserList(String arp, String name,String departmentName, Integer first, Integer pageSize);
- int getSysUserTotalCount(String arp, String name,String departmentName);
+ 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);
SysUser getSysUserByIdCard(String idCard);
boolean isSysUserExist(String arp, String account, String idCard, String editId);
List<SysUser> getApproverUserList(String department);
- List<SysUser> getHasProjectSysUserList(String department);
+ List<SysUser> getHasProjectSysUserList(String department,String project);
List<SysUser> getApplyUserList();
List<SysUser> getSeeUserList(String department);
SysUser insertSysUser(SysUser sysUser);
@@ -33,11 +37,23 @@
public int insertSysUserList(List<SysUser> userList);
- Map getUser(String id);
+ SysUser getUser(String id);
void updateUserFavor(SysReagent reagent, SysUser user) throws Exception;
List<SysUserDto> getUserInfo();
+ HazardousWasteUser getUserByAccount(String account,String name);
+ 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();
+
+ SysUser getUserByName(String approveUserName);
}
--
Gitblit v1.9.2