From badb24bad173d03941aef128d3ec74188a4e4467 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Tue, 02 Feb 2021 14:37:47 +0800
Subject: [PATCH] 实验室导出
---
src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
index 005042c..95e1f42 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;
@@ -71,6 +72,8 @@
private String laboratoryType;
private String laboratoryName;
+ private String project;
+ private String controllerName;
private int action;
@@ -136,6 +139,7 @@
public void onSaveBtnClick() {
try {
+
// 新建
if (this.action == Constants.ACTION_ADD) {
if (this.sysLaboratoryContainer == null) {
@@ -170,6 +174,7 @@
return;
}
System.out.println(sysLaboratoryContainer.getContainerCode());
+
this.sysLaboratoryContainerService.insertSysLaboratoryContainer(sysLaboratoryContainer);
FacesUtils.info("新建成功。");
@@ -207,6 +212,9 @@
FacesUtils.warn("临时存储库条码已存在。");
return;
}
+
+ sysLaboratoryContainer.setProject(null);
+ sysLaboratoryContainer.getProject();
this.sysLaboratoryContainerService.updateSysLaboratoryContainer(sysLaboratoryContainer);
@@ -378,11 +386,11 @@
List<SysLaboratoryContainer> list = null;
try {
int count = sysLaboratoryContainerService.getSysLaboratoryContainerTotalCount(laboratoryType,
- laboratoryName,null);
+ laboratoryName,null,project,controllerName);
this.setRowCount(count);
if (count > 0) {
list = sysLaboratoryContainerService.getSysLaboratoryContainerList(laboratoryType,
- laboratoryName,null, first, pageSize);
+ laboratoryName,null,project,controllerName, first, pageSize);
}
} catch (Exception e) {
logger.error(e);
@@ -465,4 +473,19 @@
this.controllers = controllers;
}
+ public String getProject() {
+ return project;
+ }
+
+ public void setProject(String project) {
+ this.project = project;
+ }
+
+ public String getControllerName() {
+ return controllerName;
+ }
+
+ public void setControllerName(String controllerName) {
+ this.controllerName = controllerName;
+ }
}
--
Gitblit v1.9.2