From 1cbac7aa20a183a9a893651bf0cef24b1909eb5c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 10:19:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/dao/SysReagentDao.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.java b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.java
index 54619ec..0fabdf9 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.java
@@ -3,6 +3,7 @@
import com.nanometer.smartlab.entity.SysReagent;
import org.springframework.dao.DataAccessException;
+import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@@ -12,10 +13,12 @@
public interface SysReagentDao {
public SysReagent getSysReagent(String id) throws DataAccessException;
- public SysReagent getSysReagentByCas(SysReagent sysReagent) throws DataAccessException;
+ public List<SysReagent> getSysReagentByCas(SysReagent sysReagent) throws DataAccessException;
public SysReagent getSysReagentByCas2(SysReagent sysReagent) throws DataAccessException;
public List<SysReagent> getSysReagentList(Map params) throws DataAccessException;
+ public List<SysReagent> getSysReagentListNew(Map params) throws DataAccessException;
public int getSysReagentTotalCount(Map params) throws DataAccessException;
+ public int getSysReagentTotalCountNew(Map params) throws DataAccessException;
public void insertSysReagent(SysReagent sysReagent) throws DataAccessException;
public int updateSysReagent(SysReagent sysReagent) throws DataAccessException;
@@ -23,6 +26,14 @@
public int deleteSysReagent(List<String> ids) throws DataAccessException;
public List<SysReagent> query();
-
+ //试剂库总数
+ int reagentCount(Map params);
+ List<SysReagent> reagentList(Map params);
+ int favorCount(Map params);
+ List<SysReagent> favorList(Map params);
Map getSysReagentDetail(String id);
+
+ String getReagentUnitByReagentId(String reagentId);
+
+ List<SysReagent> getReagent(Map params);
}
--
Gitblit v1.9.2