From badb24bad173d03941aef128d3ec74188a4e4467 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Tue, 02 Feb 2021 14:37:47 +0800
Subject: [PATCH] 实验室导出
---
src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java
index 3a3e9e6..ad0eac0 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java
@@ -61,7 +61,7 @@
}
}
- public List<SysReagent> getSysReagentListNew(String name, String cas, String supplierId,Integer type, Integer first, Integer pageSize) {
+ public List<SysReagent> getSysReagentListNew(String name, String cas, String supplierId,Integer type, Integer first, Integer pageSize,String productSn) {
try {
Map<String, Object> params = new HashMap<String, Object>();
params.put("name", name);
@@ -70,6 +70,7 @@
params.put("type", type);
params.put("first", first);
params.put("pageSize", pageSize);
+ params.put("productSn", productSn);
return this.sysReagentDao.getSysReagentListNew(params);
} catch (DataAccessException e) {
logger.error(e.getMessage(), e);
@@ -124,7 +125,7 @@
}
@Override
- public List<SysReagent> reagentList(SysUser user, String name, String cas, String supplierId, String productSn, int first, int pageSize) {
+ public List<SysReagent> reagentList(SysUser user, String name, String cas, String supplierId, String productSn, int first, int pageSize,int count) {
Map<String, Object> params = new HashMap<>();
params.put("user", user.getId());
params.put("name", name);
@@ -133,7 +134,7 @@
params.put("productSn", productSn);
params.put("first", first);
params.put("pageSize", pageSize);
- params.put("MaxSize", first+pageSize);
+ params.put("MaxSize", count);
return sysReagentDao.reagentList(params);
}
@@ -176,13 +177,14 @@
}
- public int getSysReagentTotalCountNew(String name, String cas, String supplierId,Integer type) {
+ public int getSysReagentTotalCountNew(String name, String cas, String supplierId,Integer type,String productSn) {
try {
Map<String, Object> params = new HashMap<String, Object>();
params.put("name", name);
params.put("cas", cas);
params.put("type", type);
params.put("supplierId", supplierId);
+ params.put("productSn", productSn);
return this.sysReagentDao.getSysReagentTotalCountNew(params);
} catch (DataAccessException e) {
logger.error(e.getMessage(), e);
@@ -274,16 +276,18 @@
}
@Override
+ @Transactional
public int insertSysReagentList(List<SysReagent> sysReagentList) {
try {
int i = 0;
for (SysReagent sysReagent:sysReagentList
) {
- SysReagent sysReagentTmpl = new SysReagent();
- sysReagentTmpl = sysReagentDao.getSysReagentByCas(sysReagent);
- if(sysReagentTmpl!=null){
- sysReagent.setId(sysReagentTmpl.getId());
- this.sysReagentDao.updateSysReagentForExport(sysReagent);
+ List<SysReagent> sysReagentTmpl = sysReagentDao.getSysReagentByCas(sysReagent);
+ if(sysReagentTmpl.size()>0){
+ for (SysReagent sr : sysReagentTmpl) {
+ sysReagent.setId(sr.getId());
+ this.sysReagentDao.updateSysReagentForExport(sysReagent);
+ }
}else{
if (sysReagent.getId() == null) {
sysReagent.setId(IDUtils.uuid());
--
Gitblit v1.9.2