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/SysControllerMngController.java | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/SysControllerMngController.java b/src/main/java/com/nanometer/smartlab/controller/SysControllerMngController.java
index d40502f..2f9e897 100644
--- a/src/main/java/com/nanometer/smartlab/controller/SysControllerMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/SysControllerMngController.java
@@ -125,6 +125,25 @@
}
}
+ public void uploadFile(FileUploadEvent event){
+ try {
+ sysControllerService.uploadFile(event);
+ } catch (Exception e) {
+ e.printStackTrace();
+ FacesUtils.warn("导入失败");
+ }
+ }
+
+ public void export2Excel(){
+ List<Map> list = sysControllerService.exportExcelList(name, code);
+ try{
+ sysControllerService.export2Excel(list);
+ }catch (Exception e){
+ e.printStackTrace();
+ FacesUtils.warn("导出失败");
+ }
+ }
+
public LazyDataModel<SysController> getDataModel() {
if (this.dataModel == null) {
this.dataModel = new LazyDataModel<SysController>() {
@@ -137,6 +156,7 @@
if (count > 0) {
list = sysControllerService.getSysControllerList(code, name, first, pageSize);
}
+ selectedList = new ArrayList<>();
} catch (Exception e) {
logger.error(e);
}
@@ -145,25 +165,23 @@
@Override
public SysController getRowData(String rowKey) {
- Iterator<SysController> iterator = this.iterator();
- if (iterator != null) {
- SysController br = null;
- while (iterator.hasNext()) {
- br = iterator.next();
- if (Integer.valueOf(rowKey) == br.getId()) {
- return br;
- }
- }
- }
- return null;
+// Iterator<SysController> iterator = this.iterator();
+// if (iterator != null) {
+// SysController br = null;
+// while (iterator.hasNext()) {
+// br = iterator.next();
+// if (Integer.valueOf(rowKey) == br.getId()) {
+// return br;
+// }
+// }
+// }
+ return sysControllerService.getSysController(Integer.parseInt(rowKey));
}
};
}
return dataModel;
}
-
-
public String getName() {
return name;
--
Gitblit v1.9.2