From 3da43e60cd97ad330dcc0911d76bb3c395a65b0c Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 02 七月 2021 12:09:38 +0800
Subject: [PATCH] 修改危废统计
---
src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java
index 9cde196..007fe8f 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java
@@ -1,5 +1,6 @@
package com.nanometer.smartlab.controller;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -190,12 +191,25 @@
FacesUtils.warn("请选择数据。");
return;
}
- if ("智能柜".equals(baseMetaService.getBaseMetaValue(sysWarehouseContainer.getType()))) {
- this.sysWarehouseContainerService.deleteSysWarehouseContainer2(this.selectedList);
- }else{
- this.sysWarehouseContainerService.deleteSysWarehouseContainer(this.selectedList);
+
+ List<SysWarehouseContainer> sysWarehouseContainers = new ArrayList<>();
+ List<SysWarehouseContainer> sysWarehouseContainerList = new ArrayList<>();
+
+ for (SysWarehouseContainer sysWarehouseContainer : this.selectedList){
+ if(this.baseMetaService.getBaseMetaKey(sysWarehouseContainer.getType()).equals("200")) {
+ sysWarehouseContainers.add(sysWarehouseContainer);
+ }else {
+ sysWarehouseContainerList.add(sysWarehouseContainer);
+ }
}
+ if (sysWarehouseContainers.size() > 0){
+ this.sysWarehouseContainerService.deleteSysWarehouseContainer2(sysWarehouseContainers);
+ }
+
+ if (sysWarehouseContainerList.size() > 0){
+ this.sysWarehouseContainerService.deleteSysWarehouseContainer(sysWarehouseContainerList);
+ }
FacesUtils.info("删除成功。");
} catch (Exception e) {
@@ -232,6 +246,7 @@
list = sysWarehouseContainerService.getSysWarehouseContainerList(warehouseType,
warehouseName,null, first, pageSize);
}
+ selectedList = new ArrayList<>();
} catch (Exception e) {
logger.error(e);
}
@@ -240,17 +255,17 @@
@Override
public SysWarehouseContainer getRowData(String rowKey) {
- Iterator<SysWarehouseContainer> iterator = this.iterator();
- if (iterator != null) {
- SysWarehouseContainer su = null;
- while (iterator.hasNext()) {
- su = iterator.next();
- if (rowKey.equals(su.getId())) {
- return su;
- }
- }
- }
- return null;
+// Iterator<SysWarehouseContainer> iterator = this.iterator();
+// if (iterator != null) {
+// SysWarehouseContainer su = null;
+// while (iterator.hasNext()) {
+// su = iterator.next();
+// if (rowKey.equals(su.getId())) {
+// return su;
+// }
+// }
+// }
+ return sysWarehouseContainerService.getSysWarehouseContainer(rowKey);
}
};
}
--
Gitblit v1.9.2