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

---
 src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java
index 96fd330..b7733c8 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java
@@ -1,8 +1,10 @@
 package com.nanometer.smartlab.service;
 
 import com.nanometer.smartlab.entity.SysLaboratory;
+import com.nanometer.smartlab.entity.dto.LaboratoryVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by cmower on 17/11/20.
@@ -31,4 +33,9 @@
 
 	void insertSysReagentList(List<SysLaboratory> sysLaboratoryList);
 
+    void exportLab2Excel(List<Map> list) throws  Exception;
+
+	List<Map> exportLabList(String type, String name);
+
+	List<LaboratoryVo.Laboratory> getLaboratoryByProject(String project);
 }

--
Gitblit v1.9.2