From 0d672522085313c648c928d37fd53b25f4afd9cf Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Thu, 17 Dec 2020 16:10:20 +0800
Subject: [PATCH] 模块：试剂库 修改：价格排序 提出：区老师
---
src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java | 15 +++++++++++++++
1 files changed, 15 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..dad9793 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;
@@ -170,6 +171,9 @@
return;
}
System.out.println(sysLaboratoryContainer.getContainerCode());
+ if (!StringUtils.isNotBlank(sysLaboratoryContainer.getProjectId())){
+ sysLaboratoryContainer.setProjectId(null);
+ }
this.sysLaboratoryContainerService.insertSysLaboratoryContainer(sysLaboratoryContainer);
FacesUtils.info("新建成功。");
@@ -219,6 +223,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