From dac136a54c51842a9cd9abd97c236b43cb48d169 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 09 四月 2021 16:10:42 +0800
Subject: [PATCH] 修改库中领取无法打印领用单

---
 src/main/java/com/nanometer/smartlab/service/SysUserService.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserService.java b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
index 7902b02..bed31fc 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,8 +14,10 @@
  */
 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);
@@ -39,6 +43,9 @@
 
     List<SysUserDto> getUserInfo();
 
-    SysUser getUserByAccount(String account);
+    HazardousWasteUser getUserByAccount(String account,String name);
 
+    List<LaboratoryVo.LaboratoryUser> getUserByProject(String project);
+
+    List<SysUser> getUserByArp(String arp);
 }

--
Gitblit v1.9.2