From f0792fca6d0874de97411af39c4d58d0c120412f Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期六, 09 十一月 2024 17:15:16 +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/ZfCollectionController.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java
index 112aec8..aaea9bd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java
@@ -49,6 +49,11 @@
return zfCollectionService.selectDataList(zfCollection, pageNum, pageSize);
}
+ @GetMapping("/type")
+ public AjaxResult listType(){
+ return zfCollectionService.listType();
+ }
+
/**
* 鏍规嵁id鏌ヨ
*/
@@ -67,25 +72,25 @@
util.exportExcel(response,list,"鏀惰棌鑽ｈ獕瀵煎叆妯℃澘");
}
-// /**
-// * 瀵煎嚭鏀惰棌鍜岃崳瑾夎褰曞垪琛�
-// */
-//// @PreAuthorize("@ss.hasPermi('system:property:export')")
-// @Log(title = "鏀惰棌鍜岃崳瑾夎褰�", businessType = BusinessType.EXPORT)
-// @PostMapping("/export")
-// public void export(HttpServletResponse response, ZfCollection zfCollection)
-// {
-// List<ZfCollection> list = zfCollectionService.selectByCondition(zfCollection);
-// log.info("瀵煎嚭璁板綍涓�:{}",list);
-// ExcelUtil<ZfCollection> util = new ExcelUtil<>(ZfCollection.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, ZfCollection zfCollection)
+ {
+ List<ZfCollection> list = zfCollectionService.selectByCondition(zfCollection);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZfCollection> util = new ExcelUtil<>(ZfCollection.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<ZfCollection> list = zfCollectionService.selectByIds(ids);
--
Gitblit v1.9.1