From aab1d1e20e7b4b72a9bd98c5d26fdfb087b4c57b Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 02 二月 2021 18:07:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master

---
 src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java |   45 +++++++++++++++++++++++++++------------------
 1 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
index 95e1f42..f00e5f5 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
@@ -2,16 +2,13 @@
 
 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.SysLaboratory;
-import com.nanometer.smartlab.service.SysLaboratoryService;
+import com.nanometer.smartlab.service.*;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -29,9 +26,6 @@
 
 import com.nanometer.smartlab.entity.SysController;
 import com.nanometer.smartlab.entity.SysLaboratoryContainer;
-import com.nanometer.smartlab.service.BaseMetaService;
-import com.nanometer.smartlab.service.SysControllerService;
-import com.nanometer.smartlab.service.SysLaboratoryContainerService;
 import com.nanometer.smartlab.util.Constants;
 import com.nanometer.smartlab.util.FacesUtils;
 
@@ -55,6 +49,8 @@
     private BaseMetaService baseMetaService;
 	@Resource
 	private SysLaboratoryService sysLaboratoryService;
+	@Resource
+	private SysProjectService sysProjectService;
 	/**
 	 * 数据源
 	 */
@@ -230,7 +226,7 @@
 	public void export2Excel(){
 
 		try {
-			List<Map> list = sysLaboratoryContainerService.exportExcelList(laboratoryType, laboratoryName);
+			List<Map> list = sysLaboratoryContainerService.exportExcelList(laboratoryType, laboratoryName,project,controllerName);
 			sysLaboratoryContainerService.export2Excel(list);
 		}catch (Exception e){
 			e.printStackTrace();
@@ -297,15 +293,28 @@
 				System.out.println("value :     "+valuesList);
 				SysLaboratoryContainer sysLaboratoryContainer=new SysLaboratoryContainer();
 				sysLaboratoryContainer.setLaboratoryId(getLabId(sysLaboratories,valuesList.get(0)));
-				sysLaboratoryContainer.setControllerCode(getConCode(sysControllers,valuesList.get(1)));
-				sysLaboratoryContainer.setContainerCode(valuesList.get(2));
-				sysLaboratoryContainer.setType(getBaseMetaId(typeList,valuesList.get(3)));
-				sysLaboratoryContainer.setInfoCode(valuesList.get(4));
-				sysLaboratoryContainer.setStructure(getBaseMetaId(struList,valuesList.get(5)));
-				sysLaboratoryContainer.setName(valuesList.get(6));
-				if(valuesList.get(3).equals("智能柜")){
-					sysLaboratoryContainer.setCharacterLeft(getBaseMetaId(charList,valuesList.get(7)));
-					sysLaboratoryContainer.setCharacterRight(getBaseMetaId(charList,valuesList.get(8)));
+				if (!valuesList.get(1).replace(" ","").isEmpty()){
+					List<String> projects = Arrays.asList(valuesList.get(1).split(","));
+					for (String project : projects) {
+						//不存再就直接推出
+						if (!sysProjectService.isExistProject(project)) {
+							throw new Exception("课题组不存在,(" + i  + "行)");
+						}
+					}
+					//都存在就设置
+					sysLaboratoryContainer.setProject(valuesList.get(1).replace(" ",""));
+				}else{
+					sysLaboratoryContainer.setProject(null);
+				}
+				sysLaboratoryContainer.setControllerCode(getConCode(sysControllers,valuesList.get(2)));
+				sysLaboratoryContainer.setContainerCode(valuesList.get(3));
+				sysLaboratoryContainer.setType(getBaseMetaId(typeList,valuesList.get(4)));
+				sysLaboratoryContainer.setInfoCode(valuesList.get(5));
+				sysLaboratoryContainer.setStructure(getBaseMetaId(struList,valuesList.get(6)));
+				sysLaboratoryContainer.setName(valuesList.get(7));
+				if(valuesList.get(4).equals("智能柜")){
+					sysLaboratoryContainer.setCharacterLeft(getBaseMetaId(charList,valuesList.get(8)));
+					sysLaboratoryContainer.setCharacterRight(getBaseMetaId(charList,valuesList.get(9)));
 				}
 				sysLaboratoryContainers.add(sysLaboratoryContainer);
 			}

--
Gitblit v1.9.2