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/SysLaboratoryContainerService.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java
index df8cdec..d2fc092 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java
@@ -1,7 +1,9 @@
 package com.nanometer.smartlab.service;
 
+import com.nanometer.smartlab.entity.SysLaboratory;
 import com.nanometer.smartlab.entity.SysLaboratoryContainer;
 import com.nanometer.smartlab.entity.SysUser;
+import com.nanometer.smartlab.model.CommonPage;
 
 import java.util.List;
 import java.util.Map;
@@ -13,6 +15,8 @@
 
     List<SysLaboratoryContainer> getSysLaboratoryContainerList(String laboratoryType, String laboratoryName, String laboratoryId
             ,String project,String controllerName, Integer first, Integer pageSize);
+
+    CommonPage<SysLaboratoryContainer> getSysLaboratoryContainerList(Integer pageNum,Integer pageSize,String name,String controllerName);
     List<SysLaboratoryContainer> getSysLaboratoryContainerList(String laboratoryId);
     int getSysLaboratoryContainerTotalCount(String laboratoryType, String laboratoryName,String laboratoryId,String project,String controllerName);
     SysLaboratoryContainer getSysLaboratoryContainer(String id);
@@ -31,10 +35,11 @@
 
     Map selectLocationByContainerCode(String containerCode);
 
-    List<Map> exportExcelList(String laboratoryType, String laboratoryName);
+    List<Map> exportExcelList(String laboratoryType, String laboratoryName,String project,String controllerName);
 
     void export2Excel(List<Map> list) throws Exception;
 
     List<String> selectProjectsByContainerCode(String containerCode);
 
+    boolean delBySlcIds(List<SysLaboratory> selectedList);
 }

--
Gitblit v1.9.2