From e21830598f6c55f1196c519fd9005704c82a0fb3 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期三, 30 十二月 2020 15:49:09 +0800
Subject: [PATCH] 修改:idCard改成8位输入或者20位输入,转换大写 原因：扫码扫出8位，数据库和柜子使用的是20位 提出：秦老师
---
src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java | 18 ++++++++++++++++++
1 files changed, 18 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..b555f0a 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,11 @@
public void onSaveBtnClick() {
try {
+
+ if (!StringUtils.isNotBlank(sysLaboratoryContainer.getProjectId())){
+ sysLaboratoryContainer.setProjectId(null);
+ }
+
// 新建
if (this.action == Constants.ACTION_ADD) {
if (this.sysLaboratoryContainer == null) {
@@ -170,6 +176,7 @@
return;
}
System.out.println(sysLaboratoryContainer.getContainerCode());
+
this.sysLaboratoryContainerService.insertSysLaboratoryContainer(sysLaboratoryContainer);
FacesUtils.info("新建成功。");
@@ -219,6 +226,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