From 7f220c9aa253204183c42edaa98d9f78e9eb6685 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 23 五月 2023 16:09:26 +0800
Subject: [PATCH] 456

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
index b65725d..c74d0a5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
@@ -18,6 +18,7 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -66,7 +67,22 @@
     @Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ZfEvent zfEvent) {
-        List<ZfEvent> list = zfEventService.selectByCondition(zfEvent);
+        List<ZfEvent> list = new ArrayList<>();
+
+        list = zfEventService.selectByCondition(zfEvent);
+        log.info("瀵煎嚭璁板綍涓�:{}", list);
+        ExcelUtil<ZfEvent> util = new ExcelUtil<>(ZfEvent.class);
+        util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
+
+    }
+    /**
+     * 瀵煎嚭瀹跺涵澶т簨浠惰褰曞垪琛�
+     */
+//    @PreAuthorize("@ss.hasPermi('system:property:export')")
+    @Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
+    @PostMapping("/export1/{ids}")
+    public void export1(HttpServletResponse response, @PathVariable Long[] ids) {
+        List<ZfEvent> list = zfEventService.selectByIds(ids);
         log.info("瀵煎嚭璁板綍涓�:{}", list);
         ExcelUtil<ZfEvent> util = new ExcelUtil<>(ZfEvent.class);
         util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");

--
Gitblit v1.9.1