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/SysLaboratoryService.java |   16 +++++++++++++---
 1 files changed, 13 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 b7733c8..11ca396 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java
@@ -2,6 +2,7 @@
 
 import com.nanometer.smartlab.entity.SysLaboratory;
 import com.nanometer.smartlab.entity.dto.LaboratoryVo;
+import com.nanometer.smartlab.model.CommonPage;
 
 import java.util.List;
 import java.util.Map;
@@ -11,17 +12,21 @@
  */
 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);
+
+	CommonPage<SysLaboratory> getSysLaboratoryList(Integer pageNum, Integer pageSize, String name);
 
 	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);
 
 	SysLaboratory getSysLaboratory(String id);
+
+	SysLaboratory getSysLaboratorySimpleInfo(String id);
 
 	SysLaboratory insertSysLaboratory(SysLaboratory sysLaboratory);
 
@@ -35,7 +40,12 @@
 
     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);
+
+
+    List<Map> getPersonInChargeByProjects(String project);
 }

--
Gitblit v1.9.2