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/ZfDoctorController.java | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorController.java index a9bc22e..9a197dd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorController.java @@ -49,11 +49,11 @@ /** * 鑾峰彇瀵煎叆妯℃澘 */ - @GetMapping("/model") + @PostMapping("/model") public void getExportModel(HttpServletResponse response){ List<ZfDoctor> list = Collections.singletonList(new ZfDoctor()); ExcelUtil<ZfDoctor> util = new ExcelUtil<>(ZfDoctor.class); - util.exportExcel(response,list,"灏忓尰鐢熻褰曟暟鎹�"); + util.exportExcel(response,list,"瀹跺涵灏忓尰鐢熷鍏ユā鏉�"); } @@ -70,7 +70,19 @@ ExcelUtil<ZfDoctor> util = new ExcelUtil<>(ZfDoctor.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<ZfDoctor> list = zfDoctorService.selectByIds(ids); + log.info("瀵煎嚭璁板綍涓�:{}",list); + ExcelUtil<ZfDoctor> util = new ExcelUtil<>(ZfDoctor.class); + util.exportExcel(response, list, "瀹跺涵灏忓尰鐢熻褰曟暟鎹�"); + } /** * 瀵煎叆瀹跺涵灏忓尰鐢熻褰曞垪琛� */ -- Gitblit v1.9.1