From 0ece929cad95dbe0bb4c8be5e03ddccacec5a935 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期二, 22 十二月 2020 12:17:25 +0800
Subject: [PATCH] 修改危化品编码

---
 src/main/java/com/nanometer/smartlab/service/SysReagentService.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysReagentService.java b/src/main/java/com/nanometer/smartlab/service/SysReagentService.java
index e38ca00..66ba215 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysReagentService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysReagentService.java
@@ -19,10 +19,21 @@
     public boolean deleteSysReagent(List<SysReagent> sysReagentList);
     public int insertSysReagentList(List<SysReagent> sysReagentList);
     public int insertSysReagentList2(List<SysReagent> sysReagentList);
-    public List<SysReagent> getSysReagentList2(SysUser user,Integer favorFlag, String name, String cas, String productSn, String supplierId, Integer first, Integer pageSize);
-    public int getSysReagentTotalCount2(SysUser user,Integer favorFlag,String name, String cas,String productSn, String supplierId);
 
+    int getSysReagentTotalCountNew(String name, String cas, String supplierId, Integer type);
     public List<SysReagent> query();
 
     Map getReagentDetail(String id);
+
+    public List<SysReagent> getSysReagentListNew(String name, String cas, String supplierId, Integer type, Integer first, Integer pageSize);
+
+    int favorCount(SysUser user, String name, String cas, String supplierId, String productSn,Integer favorFlag);
+
+    List<SysReagent> favorList(SysUser user, String name, String cas, String supplierId, String productSn,Integer favorFlag, Integer first, Integer pageSize);
+
+    int reagentCount(SysUser user, String name, String cas, String supplierId, String productSn);
+
+    List<SysReagent> reagentList(SysUser user, String name, String cas, String supplierId, String productSn, int first, int pageSize);
+
+    String getReagentUnitByReagentId(String reagentId);
 }

--
Gitblit v1.9.2