From 074c6c4389938fc38e82b6258b8ebab95fb5aff9 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 16 九月 2021 15:54:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java | 4 +++-
1 files changed, 3 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..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;
@@ -31,10 +32,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