From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
index 70a1d09..065b099 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);
}
@@ -265,17 +267,35 @@
@Override
public List<SysLaboratory> getSysLaboratoryListByUserId(String userId) {
-
//1.根据用户的课题组获取实验室,没有就按照部门
SysUser user = sysUserDao.getSysUser(userId);
Map<String,Object> params = new HashMap<>();
- params.put("project", user.getProject());
- List<SysLaboratory> list = sysLaboratoryDao.getSysLaboratoryList(params);
- if (list.size() < 1) {
+ if (StringUtils.isNotBlank(user.getProject())){
+ params.put("project", user.getProject());
+ List<SysLaboratory> list = sysLaboratoryDao.getSysLaboratoryList(params);
+ if (list.size() < 1) {
+ return this.getSysLaboratoryListByDep(user.getDepartment());
+ }else {
+ return list;
+ }
+ }else {
return this.getSysLaboratoryListByDep(user.getDepartment());
- }else{
- return list;
}
+
+ }
+
+ @Override
+ public List<Map> getPersonInChargeByProjects(String projectStr) {
+ List<Map> result = new ArrayList<>();
+ String[] projectSplit = projectStr.split(",");
+ for (int i = 0; i < projectSplit.length; i++) {
+ String project = projectSplit[i];
+ if (StringUtils.isBlank(project)) continue;
+
+ List<Map> tail = sysLaboratoryDao.getPersonInCharge(project);
+ result.addAll(tail);
+ }
+ return result;
}
@Override
--
Gitblit v1.9.2