From 4d3856e802d5c9d28d8654f35da426bdb517d7d4 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 21 六月 2021 10:32:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/dao/SysReagentDao.java | 13 ++++++++++++-
1 files changed, 12 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 db952e6..a0ca110 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.java
@@ -1,8 +1,10 @@
package com.nanometer.smartlab.dao;
import com.nanometer.smartlab.entity.SysReagent;
+import org.apache.ibatis.annotations.Param;
import org.springframework.dao.DataAccessException;
+import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@@ -12,7 +14,7 @@
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;
@@ -27,7 +29,16 @@
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);
+
+ List<SysReagent> selectReagentSafetyNum();
+
+ void updateSafetyNum(@Param("id") String id, @Param("safetynum") Integer safetynum);
}
--
Gitblit v1.9.2