From c3510da29a7974c6af7ff3de1ade3db429d6f848 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 18 八月 2021 14:27:59 +0800
Subject: [PATCH] 申购管理申请履历显示所有历史单据,提交时如有无效试剂耗材报错

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

diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java
index f8789fc..6861643 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java
@@ -1,6 +1,7 @@
 package com.nanometer.smartlab.service;
 
 import com.nanometer.smartlab.entity.SysLaboratory;
+import com.nanometer.smartlab.entity.dto.LaboratoryVo;
 
 import java.util.List;
 import java.util.Map;
@@ -10,13 +11,13 @@
  */
 public interface SysLaboratoryService {
 
-	List<SysLaboratory> getSysLaboratoryList(String type, String name, Integer first, Integer pageSize);
+	List<SysLaboratory> getSysLaboratoryList(String type, String name, String project, Integer first, Integer pageSize);
 
 	List<SysLaboratory> getAllSysLaboratoryList();
 
 	List<SysLaboratory> getSysLaboratoryListByDep(String depId);
 
-	int getSysLaboratoryTotalCount(String type, String name);
+	int getSysLaboratoryTotalCount(String type, String name,String project);
 
 	boolean isSysLaboratoryExist(String barCode, String editId);
 
@@ -34,5 +35,11 @@
 
     void exportLab2Excel(List<Map> list) throws  Exception;
 
-	List<Map> exportLabList(String type, String name);
+	List<Map> exportLabList(String type, String name,String project);
+
+	List<LaboratoryVo.Laboratory> getLaboratoryByProject(String project);
+
+	List<SysLaboratory> getSysLaboratoryListByUserId(String userId);
+
+
 }

--
Gitblit v1.9.2