From 3cc43725fa2e4b8ed4b4b00b845a7dc83f99f39a Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 23 二月 2021 16:53:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.java b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.java
index 8a3e669..e9465fb 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.java
@@ -1,6 +1,8 @@
package com.nanometer.smartlab.dao;
import com.nanometer.smartlab.entity.SysLaboratory;
+import com.nanometer.smartlab.entity.dto.LaboratoryVo;
+import org.apache.ibatis.annotations.Param;
import org.springframework.dao.DataAccessException;
import java.util.List;
@@ -27,4 +29,10 @@
public SysLaboratory getSysLaboratoryByBarCodeForExport(String barCode) throws DataAccessException;
public void updateLabExport(SysLaboratory sysLaboratory);
+
+ List<Map> exportLabList(Map params);
+
+ List<LaboratoryVo.Laboratory> getLaboratoryByProject(@Param("project") String project);
+
+ SysLaboratory getSysLaboratoryByName(String name);
}
--
Gitblit v1.9.2