From c3510da29a7974c6af7ff3de1ade3db429d6f848 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 18 八月 2021 14:27:59 +0800
Subject: [PATCH] 申购管理申请履历显示所有历史单据，提交时如有无效试剂耗材报错
---
src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
index 5534258..2650e7a 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
@@ -290,6 +290,9 @@
}
valuesList.add(cellInfo);
}
+ if (valuesList.size() != 10){
+ break;
+ }
System.out.println("value : "+valuesList);
SysLaboratoryContainer sysLaboratoryContainer=new SysLaboratoryContainer();
sysLaboratoryContainer.setLaboratoryId(getLabId(sysLaboratories,valuesList.get(0)));
@@ -401,6 +404,7 @@
list = sysLaboratoryContainerService.getSysLaboratoryContainerList(laboratoryType,
laboratoryName,null,project,controllerName, first, pageSize);
}
+ selectedList = new ArrayList<> ();
} catch (Exception e) {
logger.error(e);
}
@@ -409,17 +413,17 @@
@Override
public SysLaboratoryContainer getRowData(String rowKey) {
- Iterator<SysLaboratoryContainer> iterator = this.iterator();
- if (iterator != null) {
- SysLaboratoryContainer su = null;
- while (iterator.hasNext()) {
- su = iterator.next();
- if (rowKey.equals(su.getId())) {
- return su;
- }
- }
- }
- return null;
+// Iterator<SysLaboratoryContainer> iterator = this.iterator();
+// if (iterator != null) {
+// SysLaboratoryContainer su = null;
+// while (iterator.hasNext()) {
+// su = iterator.next();
+// if (rowKey.equals(su.getId())) {
+// return su;
+// }
+// }
+// }
+ return sysLaboratoryContainerService.getSysLaboratoryContainer(rowKey);
}
};
}
--
Gitblit v1.9.2