From e8a3e262f0c129e02f08a2b1ba15bcbb9a733d51 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Fri, 25 Jun 2021 16:34:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/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