From f675672004af0ff9071d21546a0eee0a0c8f3092 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Fri, 29 Jan 2021 08:13:30 +0800
Subject: [PATCH] 增加部分搜索
---
src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java
index d0fded3..0c514dc 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java
@@ -38,7 +38,7 @@
@Transactional(propagation = Propagation.REQUIRED)
public List<SysLaboratoryContainer> getSysLaboratoryContainerList(String laboratoryType, String laboratoryName,
- String laboratoryId, Integer first, Integer pageSize) {
+ String laboratoryId,String project,String controllerName, Integer first, Integer pageSize) {
try {
Map<String, Object> params = new HashMap<String, Object>();
if (StringUtils.isNotBlank(laboratoryType)) {
@@ -50,6 +50,8 @@
if (StringUtils.isNotBlank(laboratoryId)) {
params.put("laboratoryId", laboratoryId);
}
+ params.put("project", project);
+ params.put("controllerName", controllerName);
params.put("first", first);
params.put("pageSize", pageSize);
return this.sysLaboratoryContainerDao.getSysLaboratoryContainerList(params);
@@ -63,11 +65,11 @@
@Transactional(propagation = Propagation.REQUIRED)
public List<SysLaboratoryContainer> getSysLaboratoryContainerList(
String laboratoryId) {
- return getSysLaboratoryContainerList(null,null,laboratoryId,null,null);
+ return getSysLaboratoryContainerList(null,null,laboratoryId,null,null,null,null);
}
@Transactional(propagation = Propagation.REQUIRED)
- public int getSysLaboratoryContainerTotalCount(String laboratoryType, String laboratoryName, String laboratoryId) {
+ public int getSysLaboratoryContainerTotalCount(String laboratoryType, String laboratoryName, String laboratoryId,String project,String controllerName) {
try {
Map<String, Object> params = new HashMap<String, Object>();
if (StringUtils.isNotBlank(laboratoryType)) {
@@ -79,6 +81,8 @@
if (StringUtils.isNotBlank(laboratoryId)) {
params.put("laboratoryId", laboratoryId);
}
+ params.put("project", project);
+ params.put("controllerName", controllerName);
return this.sysLaboratoryContainerDao.getSysLaboratoryContainerTotalCount(params);
} catch (DataAccessException e) {
logger.error(e.getMessage(), e);
@@ -280,4 +284,13 @@
}
+ @Override
+ public List<String> selectProjectsByContainerCode(String containerCode) {
+ String projects = sysLaboratoryContainerDao.selectProjectsByContainerCode(containerCode);
+ if (projects != null){
+ return Arrays.asList(projects.split(","));
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.2