From 9c9503de4fb1e1b0127f83c8b2b0f645c6ab9e9c Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期四, 21 一月 2021 11:20:53 +0800
Subject: [PATCH] 修改处理报警接口

---
 src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java |   17 +++++++++++++++++
 1 files changed, 17 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..977f2bc 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
@@ -12,6 +12,7 @@
 import com.nanometer.smartlab.entity.BaseMeta;
 import com.nanometer.smartlab.entity.SysLaboratory;
 import com.nanometer.smartlab.service.SysLaboratoryService;
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Row;
@@ -136,6 +137,7 @@
 
 	public void onSaveBtnClick() {
 		try {
+
 			// 新建
 			if (this.action == Constants.ACTION_ADD) {
 				if (this.sysLaboratoryContainer == null) {
@@ -170,6 +172,7 @@
 					return;
 				}
 				System.out.println(sysLaboratoryContainer.getContainerCode());
+
 				this.sysLaboratoryContainerService.insertSysLaboratoryContainer(sysLaboratoryContainer);
 
 				FacesUtils.info("新建成功。");
@@ -208,6 +211,9 @@
 					return;
 				}
 
+				sysLaboratoryContainer.setProject(null);
+				sysLaboratoryContainer.getProject();
+
 				this.sysLaboratoryContainerService.updateSysLaboratoryContainer(sysLaboratoryContainer);
 
 				FacesUtils.info("修改成功。");
@@ -219,6 +225,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