From badb24bad173d03941aef128d3ec74188a4e4467 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 02 二月 2021 14:37:47 +0800
Subject: [PATCH] 实验室导出
---
src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java | 2 +-
src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml | 6 +++++-
src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java | 2 +-
src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java | 4 +++-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
index ca378ad..50578ee 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
@@ -85,7 +85,7 @@
public void exportLab2Excel(){
try {
- List<Map> list = sysLaboratoryService.exportLabList(type, name);
+ List<Map> list = sysLaboratoryService.exportLabList(type, name,project);
sysLaboratoryService.exportLab2Excel(list);
FacesUtils.info("导出成功");
}catch (Exception e){
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml
index a557fe8..4e3e7c7 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml
@@ -61,7 +61,8 @@
CONCAT(location1,'-',location2)
END
location,
- bm2.meta_value department
+ bm2.meta_value department,
+ sl.project
from sys_laboratory as sl
LEFT JOIN base_meta bm1 on bm1.id = sl.type
left JOIN base_meta bm2 on bm2.id = sl.department
@@ -72,6 +73,9 @@
<if test="type != null and type != ''">
and sl.type = #{type};
</if>
+ <if test="project != null and project != ''">
+ and sl.project like concat("%",#{project},"%")
+ </if>
</select>
<select id="getSysLaboratoryTotalCount" parameterType="java.util.Map" resultType="int">
diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java
index e07e4cd..6861643 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java
@@ -35,7 +35,7 @@
void exportLab2Excel(List<Map> list) throws Exception;
- List<Map> exportLabList(String type, String name);
+ List<Map> exportLabList(String type, String name,String project);
List<LaboratoryVo.Laboratory> getLaboratoryByProject(String project);
diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
index 70a1d09..60d56e6 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
@@ -245,16 +245,18 @@
map.put("barCode", "地址码");
map.put("location", "地址");
map.put("department", "部门");
+ map.put("project", "课题组");
ExcelUtils.export2Excel(list,"实验室信息",map);
}
@Override
- public List<Map> exportLabList(String type, String name) {
+ public List<Map> exportLabList(String type, String name,String project) {
Map<String,String> params = new HashMap<>();
params.put("type", type);
params.put("name", name);
+ params.put("project", project);
return sysLaboratoryDao.exportLabList(params);
}
--
Gitblit v1.9.2