From b805858ea0341e13f6213c3a9b01da6a13d22f83 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期四, 10 十二月 2020 10:39:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
index b509e77..005042c 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
@@ -219,6 +219,17 @@
 		}
 	}
 
+	public void export2Excel(){
+
+		try {
+			List<Map> list = sysLaboratoryContainerService.exportExcelList(laboratoryType, laboratoryName);
+			sysLaboratoryContainerService.export2Excel(list);
+		}catch (Exception e){
+			e.printStackTrace();
+			FacesUtils.warn("导出失败");
+		}
+	}
+
 	public void uploadFile(FileUploadEvent event) {
 		System.out.println("=========导入开始=====");
 		List<BaseMeta> typeList=baseMetaService.getBaseMetaList("container_type");

--
Gitblit v1.9.2