From dc194fb281e0e4c4ec34549adb4ad11f3cb67b35 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期一, 05 六月 2023 20:13:30 +0800
Subject: [PATCH] 123

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java |   34 ++++++++++++++++++++++++++++++----
 1 files changed, 30 insertions(+), 4 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 264df42..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
@@ -9,6 +9,8 @@
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.domain.ZfEvent;
+import com.ruoyi.domain.excel.ZfEquipmentExcelBean;
+import com.ruoyi.domain.excel.ZfEventExcelBean;
 import com.ruoyi.service.ZfEventService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -16,7 +18,9 @@
 
 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;
 
 import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
@@ -45,6 +49,16 @@
         return zfEventService.selectDataList(zfEvent, pageNum, pageSize);
     }
 
+    /**
+     * 鑾峰彇瀵煎叆妯℃澘
+     */
+    @PostMapping("/model")
+    public void getExportModel(HttpServletResponse response){
+        List<ZfEventExcelBean> list = Collections.singletonList(new ZfEventExcelBean());
+        ExcelUtil<ZfEventExcelBean> util = new ExcelUtil<>(ZfEventExcelBean.class);
+        util.exportExcel(response,list,"瀹跺ぇ浜嬭瀵煎叆妯℃澘");
+    }
+
 
     /**
      * 瀵煎嚭瀹跺涵澶т簨浠惰褰曞垪琛�
@@ -53,16 +67,28 @@
     @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, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
 
     }
 
-    public static void main(String[] args) {
-        System.out.println();
-    }
 
     /**
      * 瀵煎叆瀹跺涵澶т簨浠惰褰曞垪琛�

--
Gitblit v1.9.1