From b805858ea0341e13f6213c3a9b01da6a13d22f83 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期四, 10 十二月 2020 10:39:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/dao/SysReagentDao.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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..cc30590 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.java
@@ -15,7 +15,9 @@
public 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 +25,12 @@
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);
}
--
Gitblit v1.9.2