From 1c375d6dcd0c41bc3c206585a2712ec066bf5992 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 18 十一月 2022 10:09:13 +0800
Subject: [PATCH] 卡号 bug

---
 src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java
index f56d677..b4685e6 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java
@@ -1,5 +1,6 @@
 package com.nanometer.smartlab.service;
 
+import com.nanometer.smartlab.entity.SysLaboratory;
 import com.nanometer.smartlab.entity.SysLaboratoryContainer;
 import com.nanometer.smartlab.entity.SysUser;
 
@@ -11,9 +12,10 @@
  */
 public interface SysLaboratoryContainerService {
 
-    List<SysLaboratoryContainer> getSysLaboratoryContainerList(String laboratoryType, String laboratoryName, String laboratoryId, Integer first, Integer pageSize);
+    List<SysLaboratoryContainer> getSysLaboratoryContainerList(String laboratoryType, String laboratoryName, String laboratoryId
+            ,String project,String controllerName, Integer first, Integer pageSize);
     List<SysLaboratoryContainer> getSysLaboratoryContainerList(String laboratoryId);
-    int getSysLaboratoryContainerTotalCount(String laboratoryType, String laboratoryName,String laboratoryId);
+    int getSysLaboratoryContainerTotalCount(String laboratoryType, String laboratoryName,String laboratoryId,String project,String controllerName);
     SysLaboratoryContainer getSysLaboratoryContainer(String id);
     SysLaboratoryContainer getSysLaboratoryContainerByContainerCode(String containerCode);
     SysLaboratoryContainer insertSysLaboratoryContainer(SysLaboratoryContainer sysLaboratory);
@@ -29,4 +31,12 @@
     List<Map> getContainerPersonInCharge(String containerCode);
 
     Map selectLocationByContainerCode(String containerCode);
+
+    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