From b1643b619696f2578e22d7f3bcc2cacca63a1ce6 Mon Sep 17 00:00:00 2001 From: zqy <2522236926@qq.com> Date: 星期日, 26 五月 2024 22:26:25 +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/ZSelfNoteController.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java index bd4919f..949ba2c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java @@ -73,8 +73,18 @@ */ // @PreAuthorize("@ss.hasPermi('system:property:export')") @Log(title = "涓汉璁颁簨鏈褰�", businessType = BusinessType.EXPORT) - @PostMapping("/export/{ids}") - public void export(HttpServletResponse response,@PathVariable Long[] ids) + @PostMapping("/export") + public void export(HttpServletResponse response) + { + List<ZSelfNote> list = zSelfNoteService.selectByCondition(); + log.info("瀵煎嚭璁板綍涓�:{}",list); + ExcelUtil<ZSelfNote> util = new ExcelUtil<>(ZSelfNote.class); + util.exportExcel(response, list, "涓汉璁颁簨鏈褰曟暟鎹�"); + } + + @Log(title = "涓汉璁颁簨鏈褰�", businessType = BusinessType.EXPORT) + @PostMapping("/export1/{ids}") + public void export1(HttpServletResponse response,@PathVariable Long[] ids) { List<ZSelfNote> list = zSelfNoteService.selectByIds(ids); log.info("瀵煎嚭璁板綍涓�:{}",list); -- Gitblit v1.9.1