From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/service/DangerousEncodeServiceImpl.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/DangerousEncodeServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/DangerousEncodeServiceImpl.java
index 390ca26..b2bd27c 100644
--- a/src/main/java/com/nanometer/smartlab/service/DangerousEncodeServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/DangerousEncodeServiceImpl.java
@@ -2,6 +2,7 @@
import com.nanometer.smartlab.dao.DangerousEncodeMapper;
import com.nanometer.smartlab.entity.DangerousEncode;
+import com.nanometer.smartlab.entity.DangerousEncodeVo;
import com.nanometer.smartlab.entity.SysUser;
import com.nanometer.smartlab.util.ExcelUtils;
import com.nanometer.smartlab.util.FacesUtils;
@@ -110,6 +111,9 @@
}
valuesList.add(cellInfo);
}
+ if (valuesList.size() != 12){
+ break;
+ }
//柜号 试剂名称码 试剂名称 CAS号 备注 性状 特性 相忌 状态 灭火器 随机码 编码
DangerousEncode dangerousEncode = new DangerousEncode();
dangerousEncode.setContainerNumber(valuesList.get(0));
@@ -159,7 +163,7 @@
}
dangerousEncode.setCount(0);
dangerousEncode.setUpdateTime(new Date());
- dangerousEncode.setCreator(user.getId());
+ dangerousEncode.setCreator(user.getName());
dangerousEncodeMapper.insert(dangerousEncode);
}
@@ -185,6 +189,21 @@
return dangerousEncodeMapper.selectByCodeAndName(reagentcode,reagentname,cas,code);
}
+ @Override
+ public List<DangerousEncode> selectByReagentName(String reagentname, String cas) {
+ return dangerousEncodeMapper.selectByReagentName(reagentname, cas);
+ }
+
+ @Override
+ public DangerousEncode selectByName(String reagentname) {
+ return dangerousEncodeMapper.selectByName(reagentname);
+ }
+
+ @Override
+ public DangerousEncode selectById(Long id) {
+ return dangerousEncodeMapper.selectById(id);
+ }
+
@Override
public void export2Excel(List<Map> list) throws Exception {
--
Gitblit v1.9.2