From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change

---
 src/main/java/com/nanometer/smartlab/controller/SysControllerMngController.java |   37 +++++++++++++++++++++++--------------
 1 files changed, 23 insertions(+), 14 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..e923100 100644
--- a/src/main/java/com/nanometer/smartlab/controller/SysControllerMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/SysControllerMngController.java
@@ -111,7 +111,7 @@
                 FacesUtils.warn("请选择数据。");
                 return;
             }
-            List<Integer> ids = new ArrayList<>();
+            List<Long> ids = new ArrayList<>();
             for(SysController controller : this.selectedList)
             {
             	 	ids.add(controller.getId());
@@ -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>() {
@@ -146,6 +156,7 @@
                         if (count > 0) {
                             list = sysControllerService.getSysControllerList(code, name, first, pageSize);
                         }
+                        selectedList = new ArrayList<>();
                     } catch (Exception e) {
                         logger.error(e);
                     }
@@ -154,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(Long.valueOf(rowKey));
                 }
             };
         }
 
         return dataModel;
     }
-
-
 
     public String getName() {
 		return name;

--
Gitblit v1.9.2