From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Mon, 01 Jul 2024 10:58:35 +0800
Subject: [PATCH] change

---
 src/main/java/com/nanometer/smartlab/service/SysUserService.java |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserService.java b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
index 2a649fe..138f64c 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;
 
@@ -14,42 +16,44 @@
  */
 public interface SysUserService {
 
-    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);
+    List<SysUser> getSysUserList(String arp, String name,String departmentName,String projectName,String company,Integer first, Integer pageSize);
+
+    CommonPage<SysUser> getSysUserList(Integer pageNum, Integer pageSize, String name);
+    int getSysUserTotalCount(String arp, String name,String departmentName,String projectName,String company);
+    int getUserCountInProject(String arp, String name,String departmentName,String projectName,String company);
+    List<SysUser> getUserInProject(String arp, String name,String departmentName,String projectName,String company,Integer first, Integer pageSize);
+    SysUser getSysUser(Long id);
+    SysUser getSysUserForSuppllier(Long id);
     SysUser getSysUserByAccount(String account);
     SysUser getSysUserByIdCard(String idCard);
-    boolean isSysUserExist(String arp, String account, String idCard, String editId);
+    boolean isSysUserExist(String arp, String account, String idCard, Long editId);
     List<SysUser> getApproverUserList(String department);
-    List<SysUser> getHasProjectSysUserList(String department,String project);
+    List<SysUser> getHasProjectSysUserList(Long department,Long projectId);
     List<SysUser> getApplyUserList();
-    List<SysUser> getSeeUserList(String department);
+    List<SysUser> getSeeUserList(Long department);
     SysUser insertSysUser(SysUser sysUser);
     boolean updateSysUser(SysUser sysUser);
     boolean deleteSysUser(List<SysUser> sysUserList);
 
     List<SysUser> getSysUserInfoList(String startTime, String endTime);
 
-    void updateUserPointBySelective(Integer point,String id);
+    void updateUserPointBySelective(Integer point,Long id);
 
     public int insertSysUserList(List<SysUser> userList);
 
-    SysUser getUser(String id);
+    SysUser getUser(Long id);
 
     void updateUserFavor(SysReagent reagent, SysUser user) throws Exception;
 
     List<SysUserDto> getUserInfo();
 
-    HazardousWasteUser getUserByAccount(String account,String name);
+    HazardousWasteUser getUserByAccount(String account,Long userId);
 
-    List<LaboratoryVo.LaboratoryUser> getUserByProject(String project);
+    List<LaboratoryVo.LaboratoryUser> getUserByProject(Long projectId);
 
     List<SysUser> getUserByArp(String arp);
 
-    List<Map> getExportUserList(String arp, String name, String departmentName, String project, String company);
+    List<Map> getExportUserList(String arp, String name, String departmentName, Long projectId, String company);
 
     void exportUser2Excel(List<Map> list)throws Exception;
 

--
Gitblit v1.9.2