From d6c65a4e3d1ca7d9a7bd6806c99fee035d0a44eb Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 27 一月 2021 16:54:34 +0800
Subject: [PATCH] 合并
---
src/main/java/com/nanometer/smartlab/service/SysReagentService.java | 17 +++++++++++++++--
1 files changed, 15 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..775a88f 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysReagentService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysReagentService.java
@@ -19,10 +19,23 @@
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,String productSn);
public List<SysReagent> query();
Map getReagentDetail(String id);
+
+ public List<SysReagent> getSysReagentListNew(String name, String cas, String supplierId, Integer type, Integer first, Integer pageSize,String productSn);
+
+ 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,int count);
+
+ String getReagentUnitByReagentId(String reagentId);
+
+ List<SysReagent> getReagent(String name, String cas, String factory, String specifications, String packing);
}
--
Gitblit v1.9.2