From aab1d1e20e7b4b72a9bd98c5d26fdfb087b4c57b Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 02 二月 2021 18:07:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master

---
 src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java
index 07ada63..5a5a6f6 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java
@@ -262,10 +262,12 @@
 	}
 
     @Override
-    public List<Map> exportExcelList(String laboratoryType, String laboratoryName) {
+    public List<Map> exportExcelList(String laboratoryType, String laboratoryName,String project,String controllerName) {
 		Map<String, String> params = new HashMap<>();
 		params.put("type", laboratoryType);
 		params.put("name", laboratoryName);
+		params.put("project", project);
+		params.put("controllerName", controllerName);
 		return sysLaboratoryContainerDao.exportExcelList(params);
     }
 
@@ -280,6 +282,7 @@
 		map.put("infoCode", "临时存储库状态码");
 		map.put("structure", "临时存储库结构");
 		map.put("name", "临时存储库名称");
+		map.put("project", "课题组");
 		ExcelUtils.export2Excel(list,"实验室临时存储库管理",map);
 
 	}

--
Gitblit v1.9.2