From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change

---
 src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 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..b9df964 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;
@@ -11,22 +13,33 @@
  */
 public interface SysLaboratoryContainerService {
 
-    List<SysLaboratoryContainer> getSysLaboratoryContainerList(String laboratoryType, String laboratoryName, String laboratoryId, Integer first, Integer pageSize);
-    List<SysLaboratoryContainer> getSysLaboratoryContainerList(String laboratoryId);
-    int getSysLaboratoryContainerTotalCount(String laboratoryType, String laboratoryName,String laboratoryId);
-    SysLaboratoryContainer getSysLaboratoryContainer(String id);
+    List<SysLaboratoryContainer> getSysLaboratoryContainerList(String laboratoryType, String laboratoryName, Long laboratoryId
+            ,String project, Integer first, Integer pageSize);
+
+    CommonPage<SysLaboratoryContainer> getSysLaboratoryContainerList(Integer pageNum,Integer pageSize,String name,String controllerName);
+    List<SysLaboratoryContainer> getSysLaboratoryContainerList(Long laboratoryId);
+    int getSysLaboratoryContainerTotalCount(String laboratoryType, String laboratoryName,Long laboratoryId,String project);
+    SysLaboratoryContainer getSysLaboratoryContainer(Long id);
     SysLaboratoryContainer getSysLaboratoryContainerByContainerCode(String containerCode);
     SysLaboratoryContainer insertSysLaboratoryContainer(SysLaboratoryContainer sysLaboratory);
     boolean updateSysLaboratoryContainer(SysLaboratoryContainer sysLaboratory);
     boolean deleteSysLaboratoryContainer(List<SysLaboratoryContainer> sysLaboratoryList);
-    boolean isSysLaboratoryContainerExist(String containerCode, String editId);
+    boolean isSysLaboratoryContainerExist(String containerCode, Long editId);
     List<SysLaboratoryContainer> getSysLaboratoryContainerInfoList(String startTime, String endTime);
 
     void insertSysReagentList(List<SysLaboratoryContainer> list);
 
-     void updateInfo(Float temp,Float humidity,Float voc1,String code,String flag);
+     void updateInfo(Float temp,Float humidity,Float voc1,Long code,String flag);
 
     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