From b4895bdc5d9268e55c0023b92cc7c2d68ba33e46 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 05 十一月 2024 10:07:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 2afc357..2334f5b 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
@@ -47,6 +47,11 @@
return zfEconomyService.selectDataList(zfEconomy, pageNum, pageSize);
}
+ @GetMapping("/type")
+ public AjaxResult listType(){
+ return zfEconomyService.listType();
+ }
+
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
@@ -66,6 +71,19 @@
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}")
+ 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, "瀹跺涵鏀舵敮鍙拌处璁板綍鏁版嵁");
@@ -100,7 +118,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfEconomy zfEconomy)
{
- return zfEconomyService.addData2(zfEconomy);
+ return zfEconomyService.addData(zfEconomy);
}
/**
@@ -111,7 +129,7 @@
@PutMapping
public AjaxResult edit(@RequestBody ZfEconomy zfEconomy)
{
- return toAjax(zfEconomyService.updateById(zfEconomy));
+ return zfEconomyService.updateData(zfEconomy);
}
//
/**
@@ -122,7 +140,7 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
- return toAjax(zfEconomyService.removeByIds(Arrays.asList(ids)));
+ return zfEconomyService.deleteData(ids);
}
--
Gitblit v1.9.1