From 59d9ea33f503e363f2e2941c7c00cc9dd9d9d1c7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期二, 28 十一月 2023 11:00:42 +0800
Subject: [PATCH] 修改课题管理bug
---
src/main/java/com/nanometer/smartlab/service/SysUserService.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserService.java b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
index bed31fc..246d72a 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
@@ -5,7 +5,9 @@
import com.nanometer.smartlab.entity.dto.HazardousWasteUser;
import com.nanometer.smartlab.entity.dto.LaboratoryVo;
import com.nanometer.smartlab.entity.dto.SysUserDto;
+import com.nanometer.smartlab.model.CommonPage;
+import java.net.Inet4Address;
import java.util.List;
import java.util.Map;
@@ -15,6 +17,8 @@
public interface SysUserService {
List<SysUser> getSysUserList(String arp, String name,String departmentName,String project,String company,Integer first, Integer pageSize);
+
+ CommonPage<SysUser> getSysUserList(Integer pageNum, Integer pageSize, String name);
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);
@@ -24,7 +28,7 @@
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);
@@ -37,7 +41,7 @@
public int insertSysUserList(List<SysUser> userList);
- Map getUser(String id);
+ SysUser getUser(String id);
void updateUserFavor(SysReagent reagent, SysUser user) throws Exception;
@@ -48,4 +52,12 @@
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