From ef0487dc7bee47a60f4894ec49fa5b1e83b829b9 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 16 六月 2021 08:43:14 +0800
Subject: [PATCH] 修改危废
---
src/main/java/com/nanometer/smartlab/service/DangerousEncodeServiceImpl.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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..7a014b9 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));
@@ -185,6 +189,16 @@
return dangerousEncodeMapper.selectByCodeAndName(reagentcode,reagentname,cas,code);
}
+ @Override
+ public List<DangerousEncodeVo> selectByReagentName(String reagentname, String cas) {
+ return dangerousEncodeMapper.selectByReagentName(reagentname, cas);
+ }
+
+ @Override
+ public DangerousEncode selectByName(String reagentname) {
+ return dangerousEncodeMapper.selectByName(reagentname);
+ }
+
@Override
public void export2Excel(List<Map> list) throws Exception {
--
Gitblit v1.9.2