From 94714af765326bc0567a336952b0811667b7be92 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期三, 27 十月 2021 16:59:27 +0800
Subject: [PATCH] 货柜预警接口:alarm 字典:alarm_type 01 主电掉电，备电工作 显示:名称+地点+柜号+内容
---
src/main/java/com/nanometer/smartlab/controller/SupplierInfoMngController.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/SupplierInfoMngController.java b/src/main/java/com/nanometer/smartlab/controller/SupplierInfoMngController.java
index fc23401..7a19d61 100644
--- a/src/main/java/com/nanometer/smartlab/controller/SupplierInfoMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/SupplierInfoMngController.java
@@ -13,6 +13,7 @@
import org.springframework.stereotype.Controller;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -116,6 +117,7 @@
if (count > 0) {
list = sysSupplierService.getSysSupplierList(name, first, pageSize);
}
+ selectedList = new ArrayList<>();
} catch (Exception e) {
logger.error(e);
}
@@ -124,17 +126,17 @@
@Override
public SysSupplier getRowData(String rowKey) {
- Iterator<SysSupplier> iterator = this.iterator();
- if (iterator != null) {
- SysSupplier ss = null;
- while (iterator.hasNext()) {
- ss = iterator.next();
- if (rowKey.equals(ss.getId())) {
- return ss;
- }
- }
- }
- return null;
+// Iterator<SysSupplier> iterator = this.iterator();
+// if (iterator != null) {
+// SysSupplier ss = null;
+// while (iterator.hasNext()) {
+// ss = iterator.next();
+// if (rowKey.equals(ss.getId())) {
+// return ss;
+// }
+// }
+// }
+ return sysSupplierService.getSysSupplier(rowKey);
}
};
}
@@ -142,6 +144,16 @@
return dataModel;
}
+ public void export2Excel(){
+ List<Map> list = sysSupplierService.exportExcelList(name);
+ try{
+ sysSupplierService.export2Excel(list);
+ }catch (Exception e){
+ e.printStackTrace();
+ FacesUtils.warn("导出失败");
+ }
+ }
+
public void uploadSupplier(FileUploadEvent event){
try {
sysSupplierService.importSupplier(event);
--
Gitblit v1.9.2