From 2039385fa4b4ac688907134ee7c7025fb2aea1fb Mon Sep 17 00:00:00 2001 From: whywhyo <1511349576@qq.com> Date: 星期日, 16 七月 2023 12:59:17 +0800 Subject: [PATCH] 666 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 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 2521423..62ca5de 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 @@ -57,25 +57,25 @@ util.exportExcel(response,list,"瀹跺涵鏀舵敮鍙拌处瀵煎叆妯℃澘"); } +// /** +// * 瀵煎嚭瀹跺涵鏀舵敮鍙拌处璁板綍鍒楄〃 +// */ +//// @PreAuthorize("@ss.hasPermi('system:property:export')") +// @Log(title = "瀹跺涵鏀舵敮鍙拌处璁板綍", businessType = BusinessType.EXPORT) +// @PostMapping("/export") +// public void export(HttpServletResponse response, ZfEconomy zfEconomy) +// { +// List<ZfEconomy> list = zfEconomyService.selectByCondition(zfEconomy); +// log.info("瀵煎嚭璁板綍涓�:{}",list); +// ExcelUtil<ZfEconomy> util = new ExcelUtil<>(ZfEconomy.class); +// util.exportExcel(response, list, "瀹跺涵鏀舵敮鍙拌处璁板綍鏁版嵁"); +// } /** * 瀵煎嚭瀹跺涵鏀舵敮鍙拌处璁板綍鍒楄〃 */ // @PreAuthorize("@ss.hasPermi('system:property:export')") @Log(title = "瀹跺涵鏀舵敮鍙拌处璁板綍", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, ZfEconomy zfEconomy) - { - List<ZfEconomy> list = zfEconomyService.selectByCondition(zfEconomy); - log.info("瀵煎嚭璁板綍涓�:{}",list); - 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}") + @PostMapping("/export/{ids}") public void export(HttpServletResponse response, @PathVariable Long[] ids) { List<ZfEconomy> list = zfEconomyService.selectByIds(ids); @@ -113,7 +113,7 @@ @PostMapping public AjaxResult add(@RequestBody ZfEconomy zfEconomy) { - return zfEconomyService.addData2(zfEconomy); + return zfEconomyService.addData(zfEconomy); } /** @@ -124,7 +124,7 @@ @PutMapping public AjaxResult edit(@RequestBody ZfEconomy zfEconomy) { - return toAjax(zfEconomyService.updateById(zfEconomy)); + return zfEconomyService.updateData(zfEconomy); } // /** @@ -135,7 +135,7 @@ @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(zfEconomyService.removeByIds(Arrays.asList(ids))); + return zfEconomyService.deleteData(ids); } -- Gitblit v1.9.1