From 7f01ee9b40b5ee18f53caed2132bbe6150975b3f Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 01 十二月 2020 17:52:04 +0800
Subject: [PATCH] 申购试剂-试剂库优化
---
src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java | 84 ++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java
index 5c9195a..a960d8d 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java
@@ -77,6 +77,41 @@
}
}
+ /**
+ * @Description: 收藏与未收藏 0未收藏 1收藏 统计个数
+ * @date 2020/12/1 17:04
+ */
+ @Override
+ public int favorCount(SysUser user, String name, String cas, String supplierId, String productSn, Integer favorFlag) {
+
+ Map<String, Object> params = new HashMap<>();
+ params.put("user", user.getId());
+ params.put("favorFlag", favorFlag);
+ params.put("name", name);
+ params.put("cas", cas);
+ params.put("supplierId", supplierId);
+ params.put("productSn", productSn);
+ return sysReagentDao.favorCount(params);
+ }
+
+ /**
+ * @Description: 收藏与未收藏 0未收藏 1收藏 统计详情
+ * @date 2020/12/1 17:04
+ */
+ @Override
+ public List<SysReagent> favorList(SysUser user, String name, String cas, String supplierId, String productSn, Integer favorFlag, Integer first, Integer pageSize) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("user", user.getId());
+ params.put("favorFlag", favorFlag);
+ params.put("name", name);
+ params.put("cas", cas);
+ params.put("supplierId", supplierId);
+ params.put("productSn", productSn);
+ params.put("first", first);
+ params.put("pageSize", pageSize);
+ return sysReagentDao.favorList(params);
+ }
+
@Transactional(propagation = Propagation.REQUIRED)
public int getSysReagentTotalCount(String name, String cas, String supplierId,Integer type) {
@@ -115,55 +150,8 @@
}
- @Transactional(propagation = Propagation.REQUIRED)
- public List<SysReagent> getSysReagentList2(SysUser user,Integer favorFlag, String name, String cas, String productSn, String supplierId, Integer first, Integer pageSize) {
- try {
- Map<String, Object> params = new HashMap<String, Object>();
- if (StringUtils.isNotBlank(name)) {
- params.put("name", "%" + name + "%");
- }
- if (StringUtils.isNotBlank(cas)) {
- params.put("cas", "%" + cas + "%");
- }
- if (StringUtils.isNotBlank(supplierId)) {
- params.put("supplierId", supplierId);
- }
- if (StringUtils.isNotBlank(productSn)) {
- params.put("productSn","%"+ productSn+"%");
- }
- params.put("user", user.getId());
- params.put("favor", favorFlag);
- params.put("first", first);
- params.put("pageSize", pageSize);
- return this.sysReagentDao.getSysReagentList(params);
- } catch (DataAccessException e) {
- logger.error(e.getMessage(), e);
- throw new BusinessException(ExceptionEnumCode.DB_ERR, MessageUtil.getMessageByCode(ExceptionEnumCode.DB_ERR.getCode()), e);
- }
- }
- @Transactional(propagation = Propagation.REQUIRED)
- public int getSysReagentTotalCount2(SysUser user,Integer favorFlag, String name, String cas,String productSn, String supplierId) {
- try {
- Map<String, Object> params = new HashMap<String, Object>();
- if (StringUtils.isNotBlank(name)) {
- params.put("name", "%" + name + "%");
- }
- if (StringUtils.isNotBlank(cas)) {
- params.put("cas", "%" + cas + "%");
- }
- if (StringUtils.isNotBlank(productSn)) {
- params.put("productSn","%"+ productSn+"%");
- }
- params.put("user", user.getId());
- params.put("favor", favorFlag);
- params.put("supplierId", supplierId);
- return this.sysReagentDao.getSysReagentTotalCount(params);
- } catch (DataAccessException e) {
- logger.error(e.getMessage(), e);
- throw new BusinessException(ExceptionEnumCode.DB_ERR, MessageUtil.getMessageByCode(ExceptionEnumCode.DB_ERR.getCode()), e);
- }
- }
+
@Transactional(propagation = Propagation.REQUIRED)
public SysReagent getSysReagent(String id) {
--
Gitblit v1.9.2