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/service/SysLaboratoryServiceImpl.java |   41 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
index 2e19650..b169e9f 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
@@ -2,14 +2,17 @@
 
 import com.nanometer.smartlab.dao.SysLaboratoryDao;
 import com.nanometer.smartlab.entity.SysLaboratory;
+import com.nanometer.smartlab.entity.dto.LaboratoryVo;
 import com.nanometer.smartlab.exception.AlarmCode;
 import com.nanometer.smartlab.exception.AlarmException;
 import com.nanometer.smartlab.exception.BusinessException;
 import com.nanometer.smartlab.exception.ExceptionEnumCode;
+import com.nanometer.smartlab.util.ExcelUtils;
 import com.nanometer.smartlab.util.IDUtils;
 import com.nanometer.smartlab.util.MessageUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.DuplicateKeyException;
@@ -18,10 +21,12 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import javax.faces.context.FacesContext;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
 
 /**
  * Created by cmower on 17/11/20.
@@ -224,7 +229,35 @@
 		}
 	}
 
+    @Override
+    public void exportLab2Excel(List<Map> list) throws Exception {
+
+		Map<String, String> map = new LinkedHashMap<>();
+		map.put("type", "类型");
+		map.put("name", "名称");
+		map.put("infoCode", "状态码");
+		map.put("barCode", "地址码");
+		map.put("location", "地址");
+		map.put("department", "部门");
+		ExcelUtils.export2Excel(list,"实验室信息",map);
+
+
+	}
+
 	@Override
+	public List<Map> exportLabList(String type, String name) {
+		Map<String,String> params = new HashMap<>();
+		params.put("type", type);
+		params.put("name", name);
+		return sysLaboratoryDao.exportLabList(params);
+	}
+
+    @Override
+    public List<LaboratoryVo.Laboratory> getLaboratoryByProject(String project) {
+		return sysLaboratoryDao.getLaboratoryByProject(project);
+    }
+
+    @Override
 	@Transactional(propagation = Propagation.REQUIRED)
 	public List<SysLaboratory> getSysLaboratoryListByDep(String depId) {
 		try {

--
Gitblit v1.9.2