From 31ffbaf322685984516cfb284fa58741debf4e96 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Fri, 29 Jan 2021 09:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
index b555f0a..95e1f42 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
@@ -72,6 +72,8 @@
private String laboratoryType;
private String laboratoryName;
+ private String project;
+ private String controllerName;
private int action;
@@ -137,10 +139,6 @@
public void onSaveBtnClick() {
try {
-
- if (!StringUtils.isNotBlank(sysLaboratoryContainer.getProjectId())){
- sysLaboratoryContainer.setProjectId(null);
- }
// 新建
if (this.action == Constants.ACTION_ADD) {
@@ -214,6 +212,9 @@
FacesUtils.warn("临时存储库条码已存在。");
return;
}
+
+ sysLaboratoryContainer.setProject(null);
+ sysLaboratoryContainer.getProject();
this.sysLaboratoryContainerService.updateSysLaboratoryContainer(sysLaboratoryContainer);
@@ -385,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);
@@ -472,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