From a061540bf4c2bdb81edc3898cd27f4ba18512846 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Thu, 22 Apr 2021 11:47:43 +0800
Subject: [PATCH] 实验室库存导出
---
src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java
index 0c514dc..5a5a6f6 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java
@@ -262,10 +262,12 @@
}
@Override
- public List<Map> exportExcelList(String laboratoryType, String laboratoryName) {
+ public List<Map> exportExcelList(String laboratoryType, String laboratoryName,String project,String controllerName) {
Map<String, String> params = new HashMap<>();
params.put("type", laboratoryType);
params.put("name", laboratoryName);
+ params.put("project", project);
+ params.put("controllerName", controllerName);
return sysLaboratoryContainerDao.exportExcelList(params);
}
@@ -280,15 +282,22 @@
map.put("infoCode", "临时存储库状态码");
map.put("structure", "临时存储库结构");
map.put("name", "临时存储库名称");
+ map.put("project", "课题组");
ExcelUtils.export2Excel(list,"实验室临时存储库管理",map);
}
@Override
public List<String> selectProjectsByContainerCode(String containerCode) {
- String projects = sysLaboratoryContainerDao.selectProjectsByContainerCode(containerCode);
- if (projects != null){
- return Arrays.asList(projects.split(","));
+ List<String> projects = sysLaboratoryContainerDao.selectProjectsByContainerCode(containerCode);
+ if (projects.size() > 0){
+ List<String> projectList = new ArrayList<>();
+ for (String project : projects){
+ if (StringUtils.isNotBlank(project)){
+ projectList.addAll(Arrays.asList(project.split(",")));
+ }
+ }
+ return projectList;
}
return null;
}
--
Gitblit v1.9.2