From d6c65a4e3d1ca7d9a7bd6806c99fee035d0a44eb Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期三, 27 一月 2021 16:54:34 +0800 Subject: [PATCH] 合并 --- src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java | 25 +++++++++++++++++++++---- 1 files changed, 21 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 4e1daf7..86ff06f 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; /** * 数据源 */ @@ -162,6 +162,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 +240,9 @@ return; } + //实体类重新获取项目组信息 + sysLaboratory.setProject(null); + sysLaboratory.getProject(); this.sysLaboratoryService.updateSysLaboratory(sysLaboratory); FacesUtils.info("修改成功。"); -- Gitblit v1.9.2