From dac136a54c51842a9cd9abd97c236b43cb48d169 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 09 四月 2021 16:10:42 +0800
Subject: [PATCH] 修改库中领取无法打印领用单
---
src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java | 12 ++++++++++--
1 files changed, 10 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..737f8dd 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java
@@ -11,9 +11,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 +30,11 @@
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);
+
}
--
Gitblit v1.9.2