From dfdd4bd5d112a17ccd1483ad11fe023817d54d26 Mon Sep 17 00:00:00 2001 From: whywhyo <1511349576@qq.com> Date: 星期六, 22 七月 2023 15:20:13 +0800 Subject: [PATCH] 45648 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java index 9664f3f..820f05d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java @@ -60,24 +60,24 @@ } -// /** -// * 瀵煎嚭瀹跺涵璁惧璁板綍鍒楄〃 -// */ -//// @PreAuthorize("@ss.hasPermi('system:equipment:export')") -// @Log(title = "瀹跺涵璁惧璁板綍", businessType = BusinessType.EXPORT) -// @PostMapping("/export") -// public void export(HttpServletResponse response, ZfEquipment zfEquipment) -// { -// List<ZfEquipment> list = zfEquipmentService.selectByCondition(zfEquipment); -// log.info("瀵煎嚭璁板綍涓�:{}",list); -// ExcelUtil<ZfEquipment> util = new ExcelUtil<ZfEquipment>(ZfEquipment.class); -// util.exportExcel(response, list, "瀹跺涵璁惧璁板綍鏁版嵁"); -// } + /** + * 瀵煎嚭瀹跺涵璁惧璁板綍鍒楄〃 + */ +// @PreAuthorize("@ss.hasPermi('system:equipment:export')") + @Log(title = "瀹跺涵璁惧璁板綍", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ZfEquipment zfEquipment) + { + List<ZfEquipment> list = zfEquipmentService.selectByCondition(zfEquipment); + log.info("瀵煎嚭璁板綍涓�:{}",list); + ExcelUtil<ZfEquipment> util = new ExcelUtil<ZfEquipment>(ZfEquipment.class); + util.exportExcel(response, list, "瀹跺涵璁惧璁板綍鏁版嵁"); + } /** * 瀵煎嚭瀹跺涵璁惧璁板綍鍒楄〃 */ @Log(title = "瀹跺涵璁惧璁板綍", businessType = BusinessType.EXPORT) - @PostMapping("/export/{ids}") + @PostMapping("/export1/{ids}") public void export(HttpServletResponse response, @PathVariable Long[] ids) { List<ZfEquipment> list = zfEquipmentService.selectByIds(ids); log.info("瀵煎嚭璁板綍涓�:{}", list); -- Gitblit v1.9.1