From 422622d3121acde709e79ca9b92f30c47e05272c Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期日, 07 二月 2021 14:38:12 +0800
Subject: [PATCH] 修改枪领用
---
src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
index 4e1daf7..50578ee 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
@@ -2,16 +2,14 @@
import java.io.InputStream;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import javax.annotation.Resource;
import com.nanometer.smartlab.entity.BaseMeta;
import com.nanometer.smartlab.entity.SysReagent;
import com.nanometer.smartlab.service.BaseMetaService;
+import com.nanometer.smartlab.service.SysProjectService;
import org.apache.log4j.Logger;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Row;
@@ -46,6 +44,8 @@
private SysLaboratoryService sysLaboratoryService;
@Resource
private BaseMetaService baseMetaService;
+ @Resource
+ private SysProjectService sysProjectService;
/**
* 数据源
*/
@@ -60,6 +60,7 @@
private List<SysLaboratory> selectedList;
private String type;
private String name;
+ private String project;
private int action;
@@ -84,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){
@@ -162,6 +163,20 @@
laboratory.setLocation1(valuesList.get(4));
laboratory.setLocation2(valuesList.get(5));
laboratory.setDepartment(returnDepartId(departList,valuesList.get(6)));
+
+ if (valuesList.size() > 7 && !valuesList.get(7).replace(" ","").isEmpty()){
+ List<String> projects = Arrays.asList(valuesList.get(7).split(","));
+ for (String project : projects) {
+ //不存再就直接推出
+ if (!sysProjectService.isExistProject(project)) {
+ throw new Exception("课题组不存在,（" + i + "行）");
+ }
+ }
+ //都存在就设置
+ laboratory.setProject(valuesList.get(7).replace(" ",""));
+ }else{
+ laboratory.setProject(null);
+ }
sysLaboratories.add(laboratory);
}
sysLaboratoryService.insertSysReagentList(sysLaboratories);
@@ -226,6 +241,9 @@
return;
}
+ //实体类重新获取项目组信息
+ sysLaboratory.setProject(null);
+ sysLaboratory.getProject();
this.sysLaboratoryService.updateSysLaboratory(sysLaboratory);
FacesUtils.info("修改成功。");
@@ -262,10 +280,10 @@
Map<String, Object> filters) {
List<SysLaboratory> list = null;
try {
- int count = sysLaboratoryService.getSysLaboratoryTotalCount(type, name);
+ int count = sysLaboratoryService.getSysLaboratoryTotalCount(type, name,project);
this.setRowCount(count);
if (count > 0) {
- list = sysLaboratoryService.getSysLaboratoryList(type, name, first, pageSize);
+ list = sysLaboratoryService.getSysLaboratoryList(type, name,project, first, pageSize);
}
} catch (Exception e) {
logger.error(e);
@@ -327,4 +345,12 @@
public void setType(String type) {
this.type = type;
}
+
+ public String getProject() {
+ return project;
+ }
+
+ public void setProject(String project) {
+ this.project = project;
+ }
}
--
Gitblit v1.9.2