From 0862c40ce7df0124cedfc0127c53b4119d2e536c Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 28 八月 2024 16:27:46 +0800
Subject: [PATCH] 修改了时间格式
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 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 62ca5de..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();
+ }
+
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
@@ -57,25 +62,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/{ids}")
+ @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}")
public void export(HttpServletResponse response, @PathVariable Long[] ids)
{
List<ZfEconomy> list = zfEconomyService.selectByIds(ids);
--
Gitblit v1.9.1