From e1454a154718e20abbab36d0def4de9124a07254 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 11 六月 2021 12:03:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java b/src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java
index 54fcbcd..9321228 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java
@@ -598,6 +598,9 @@
}
}
+ if (valuesList.size() != 6){
+ break;
+ }
System.out.println("value : "+valuesList);
sysReagent.setName(valuesList.get(0));//试剂名称
sysReagent.setProductHome(valuesList.get(1));//厂家
@@ -662,7 +665,7 @@
throw new Exception("导入文件格式不正确");
}*/
- for (int t = 0; t < totalCells; t++) {
+ for (int t = 0; t <= totalCells; t++) {
//System.out.println(row.getCell(t));
String cellInfo="";
String groupId = "";
@@ -751,6 +754,9 @@
valuesList.add(cellInfo);
}
}
+ if (valuesList.size() != 13){
+ break;
+ }
System.out.println("value : "+valuesList);
sysReagent.setProductSn(valuesList.get(0));//产品编号
--
Gitblit v1.9.2