From 8e27235844b5640441d810e18e5adc863479735b Mon Sep 17 00:00:00 2001 From: whywhyo <1511349576@qq.com> Date: 星期五, 19 五月 2023 21:41:22 +0800 Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java index d81738e..2521423 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java @@ -50,11 +50,11 @@ /** * 鑾峰彇瀵煎叆妯℃澘 */ - @GetMapping("/model") + @PostMapping("/model") public void getExportModel(HttpServletResponse response){ List<ZfEconomyExcelBean> list = Collections.singletonList(new ZfEconomyExcelBean()); ExcelUtil<ZfEconomyExcelBean> util = new ExcelUtil<>(ZfEconomyExcelBean.class); - util.exportExcel(response,list,"瀹跺涵鏀舵敮鍙拌处璁板綍鏁版嵁"); + util.exportExcel(response,list,"瀹跺涵鏀舵敮鍙拌处瀵煎叆妯℃澘"); } /** @@ -70,6 +70,19 @@ ExcelUtil<ZfEconomy> util = new ExcelUtil<>(ZfEconomy.class); util.exportExcel(response, list, "瀹跺涵鏀舵敮鍙拌处璁板綍鏁版嵁"); } + /** + * 瀵煎嚭瀹跺涵鏀舵敮鍙拌处璁板綍鍒楄〃 + */ +// @PreAuthorize("@ss.hasPermi('system:property:export')") + @Log(title = "瀹跺涵鏀舵敮鍙拌处璁板綍", businessType = BusinessType.EXPORT) + @PostMapping("/export1/{ids}") + public void export(HttpServletResponse response, @PathVariable Long[] ids) + { + List<ZfEconomy> list = zfEconomyService.selectByIds(ids); + log.info("瀵煎嚭璁板綍涓�:{}",list); + ExcelUtil<ZfEconomy> util = new ExcelUtil<>(ZfEconomy.class); + util.exportExcel(response, list, "瀹跺涵鏀舵敮鍙拌处璁板綍鏁版嵁"); + } // /** -- Gitblit v1.9.1