From 4ad8653be79cb07fc7f450540ea20d82b3971b89 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 12 一月 2021 14:19:44 +0800
Subject: [PATCH] 模块：用户管理 修改：导入新增课题组,修改导入时插入的代码问题 提出：秦老师
---
src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java
index d615fcc..b78f7bc 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java
@@ -124,7 +124,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,13 +133,24 @@
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);
}
@Override
public String getReagentUnitByReagentId(String reagentId) {
return sysReagentDao.getReagentUnitByReagentId(reagentId);
+ }
+
+ @Override
+ public List<SysReagent> getReagent(String name, String cas, String factory, String specifications, String packing) {
+ Map<String, String> params = new HashMap<>();
+ params.put("name", name);
+ params.put("cas", cas);
+ params.put("factory", factory);
+ params.put("specifications", specifications);
+ params.put("packing", packing);
+ return sysReagentDao.getReagent(params);
}
@@ -263,16 +274,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