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/LaboratoryMngController.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
index ca378ad..4beb892 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
@@ -9,6 +9,7 @@
import com.nanometer.smartlab.entity.BaseMeta;
import com.nanometer.smartlab.entity.SysReagent;
import com.nanometer.smartlab.service.BaseMetaService;
+import com.nanometer.smartlab.service.SysLaboratoryContainerService;
import com.nanometer.smartlab.service.SysProjectService;
import org.apache.log4j.Logger;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -42,6 +43,8 @@
@Resource
private SysLaboratoryService sysLaboratoryService;
+ @Resource
+ private SysLaboratoryContainerService sysLaboratoryContainerService;
@Resource
private BaseMetaService baseMetaService;
@Resource
@@ -85,7 +88,7 @@
public void exportLab2Excel(){
try {
- List<Map> list = sysLaboratoryService.exportLabList(type, name);
+ List<Map> list = sysLaboratoryService.exportLabList(type, name,project);
sysLaboratoryService.exportLab2Excel(list);
FacesUtils.info("导出成功");
}catch (Exception e){
@@ -151,8 +154,9 @@
}
valuesList.add(cellInfo);
-
-
+ }
+ if (valuesList.size() != 8){
+ break;
}
System.out.println("value : "+valuesList);
SysLaboratory laboratory=new SysLaboratory();
@@ -263,6 +267,7 @@
}
this.sysLaboratoryService.deleteSysLaboratory(this.selectedList);
+ this.sysLaboratoryContainerService.delBySlcIds(this.selectedList);
FacesUtils.info("删除成功。");
} catch (Exception e) {
@@ -285,6 +290,7 @@
if (count > 0) {
list = sysLaboratoryService.getSysLaboratoryList(type, name,project, first, pageSize);
}
+ selectedList = new ArrayList<> ();
} catch (Exception e) {
logger.error(e);
}
@@ -293,17 +299,17 @@
@Override
public SysLaboratory getRowData(String rowKey) {
- Iterator<SysLaboratory> iterator = this.iterator();
- if (iterator != null) {
- SysLaboratory su = null;
- while (iterator.hasNext()) {
- su = iterator.next();
- if (rowKey.equals(su.getId())) {
- return su;
- }
- }
- }
- return null;
+// Iterator<SysLaboratory> iterator = this.iterator();
+// if (iterator != null) {
+// SysLaboratory su = null;
+// while (iterator.hasNext()) {
+// su = iterator.next();
+// if (rowKey.equals(su.getId())) {
+// return su;
+// }
+// }
+// }
+ return sysLaboratoryService.getSysLaboratory(rowKey);
}
};
}
--
Gitblit v1.9.2