From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change

---
 src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java |   68 ++++++++++++++++++++++------------
 1 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
index 50578ee..dce2411 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
@@ -3,13 +3,17 @@
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
 import com.nanometer.smartlab.entity.BaseMeta;
+import com.nanometer.smartlab.entity.SysProject;
 import com.nanometer.smartlab.entity.SysReagent;
 import com.nanometer.smartlab.service.BaseMetaService;
+import com.nanometer.smartlab.service.SysLaboratoryContainerService;
 import com.nanometer.smartlab.service.SysProjectService;
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Row;
@@ -43,6 +47,8 @@
 	@Resource
 	private SysLaboratoryService sysLaboratoryService;
 	@Resource
+	private SysLaboratoryContainerService sysLaboratoryContainerService;
+	@Resource
 	private BaseMetaService baseMetaService;
 	@Resource
 	private SysProjectService sysProjectService;
@@ -53,7 +59,7 @@
 	/**
 	 * 数据模型
 	 */
-	private SysLaboratory sysLaboratory;
+	private SysLaboratory sysLaboratory=new SysLaboratory();
 	/**
 	 * 选中的list
 	 */
@@ -83,9 +89,22 @@
 		RequestContext.getCurrentInstance().execute("PF('dialog').show()");
 	}
 
+	public String getProjectName(String project){
+		if(StringUtils.isBlank(project)){
+			return "";
+		}
+		List<String> idstrs = Arrays.asList(project.split(","));
+		List<Long> ids=idstrs.stream().map(item -> Long.valueOf(item)).collect(Collectors.toList());
+		List<SysProject> projects=this.sysProjectService.getProjectByIds(ids);
+		if(projects==null||projects.size()==0){
+			return "";
+		}
+		List<String> projectNames=projects.stream().map(SysProject::getProjectName).collect(Collectors.toList());
+		return String.join(",",projectNames);
+	}
 	public void exportLab2Excel(){
 		try {
-			List<Map> list = sysLaboratoryService.exportLabList(type, name,project);
+			List<SysLaboratory> list = sysLaboratoryService.exportLabList(type, name,project);
 			sysLaboratoryService.exportLab2Excel(list);
 			FacesUtils.info("导出成功");
 		}catch (Exception e){
@@ -95,7 +114,6 @@
 	}
 
 	public void uploadFile(FileUploadEvent event) {
-		System.out.println("=========导入开始=====");
 		List<BaseMeta> typeList=baseMetaService.getBaseMetaList("laboratory_type");
 		List<BaseMeta> departList=baseMetaService.getBaseMetaList("user_department");
 		try{
@@ -151,10 +169,10 @@
 
 					}
 					valuesList.add(cellInfo);
-
-
 				}
-				System.out.println("value :     "+valuesList);
+				if (valuesList.size() != 8){
+					break;
+				}
 				SysLaboratory laboratory=new SysLaboratory();
 				laboratory.setType(returnTypeId(typeList,valuesList.get(0)));
 				laboratory.setName(valuesList.get(1));
@@ -180,7 +198,6 @@
 				sysLaboratories.add(laboratory);
 			}
 			sysLaboratoryService.insertSysReagentList(sysLaboratories);
-			System.out.println("=========导入结束=====");
 			FacesUtils.info("导入成功。");
 		}catch (Exception ex) {
 			ex.printStackTrace();
@@ -188,8 +205,8 @@
 		}
 	}
 
-	public String returnTypeId(List<BaseMeta> list,String name){
-		String id="";
+	public Long returnTypeId(List<BaseMeta> list,String name){
+		Long id=null;
 		for(int i=0;i<list.size();i++){
 			if(name.equals(list.get(i).getMetaValue())){
 				id=list.get(i).getId();
@@ -198,8 +215,8 @@
 		return  id;
 	}
 
-	public String returnDepartId(List<BaseMeta> list,String name){
-		String id="";
+	public Long returnDepartId(List<BaseMeta> list,String name){
+		Long id=null;
 		for(int i=0;i<list.size();i++){
 			if(name.equals(list.get(i).getMetaValue())){
 				id=list.get(i).getId();
@@ -242,8 +259,8 @@
 				}
 
 				//实体类重新获取项目组信息
-				sysLaboratory.setProject(null);
-				sysLaboratory.getProject();
+//				sysLaboratory.setProject(null);
+//				sysLaboratory.getProject();
 				this.sysLaboratoryService.updateSysLaboratory(sysLaboratory);
 
 				FacesUtils.info("修改成功。");
@@ -263,6 +280,7 @@
 			}
 
 			this.sysLaboratoryService.deleteSysLaboratory(this.selectedList);
+			this.sysLaboratoryContainerService.delBySlcIds(this.selectedList);
 
 			FacesUtils.info("删除成功。");
 		} catch (Exception e) {
@@ -285,6 +303,7 @@
 						if (count > 0) {
 							list = sysLaboratoryService.getSysLaboratoryList(type, name,project, first, pageSize);
 						}
+						selectedList = new ArrayList<> ();
 					} catch (Exception e) {
 						logger.error(e);
 					}
@@ -293,17 +312,18 @@
 
 				@Override
 				public SysLaboratory getRowData(String rowKey) {
-					Iterator<SysLaboratory> iterator = this.iterator();
-					if (iterator != null) {
-						SysLaboratory su = null;
-						while (iterator.hasNext()) {
-							su = iterator.next();
-							if (rowKey.equals(su.getId())) {
-								return su;
-							}
-						}
-					}
-					return null;
+//					Iterator<SysLaboratory> iterator = this.iterator();
+//					if (iterator != null) {
+//						SysLaboratory su = null;
+//						while (iterator.hasNext()) {
+//							su = iterator.next();
+//							if (rowKey.equals(su.getId())) {
+//								return su;
+//							}
+//						}
+//					}
+					Long id=Long.valueOf(rowKey);
+					return sysLaboratoryService.getSysLaboratory(id);
 				}
 			};
 		}

--
Gitblit v1.9.2