From e57dc5878ff7170e2a8d8da145289ad1abcd70f8 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Thu, 28 Jan 2021 16:47:52 +0800
Subject: [PATCH] 申领人实验室搜索逻辑修改 ->优先课题组下的实验室，如果没有则搜索部门下的实验室
---
src/main/java/com/nanometer/smartlab/controller/SysControllerMngController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/SysControllerMngController.java b/src/main/java/com/nanometer/smartlab/controller/SysControllerMngController.java
index cac7f40..ba6d579 100644
--- a/src/main/java/com/nanometer/smartlab/controller/SysControllerMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/SysControllerMngController.java
@@ -134,6 +134,16 @@
}
}
+ 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>() {
@@ -171,8 +181,6 @@
return dataModel;
}
-
-
public String getName() {
return name;
--
Gitblit v1.9.2