From bd609455667411a75c03433dc3490a790c71b7d3 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期日, 21 五月 2023 18:35:36 +0800
Subject: [PATCH] 111
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 6de43d0..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;
@@ -55,7 +56,7 @@
public void getExportModel(HttpServletResponse response){
List<ZfEventExcelBean> list = Collections.singletonList(new ZfEventExcelBean());
ExcelUtil<ZfEventExcelBean> util = new ExcelUtil<>(ZfEventExcelBean.class);
- util.exportExcel(response,list,"瀹跺ぇ浜嬭璁板綍鏁版嵁");
+ util.exportExcel(response,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