From 699001a9fd31b4fc78e76bcff86ed324dd052c0c Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 12 十一月 2025 17:00:47 +0800
Subject: [PATCH] 修改了一个bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 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 b26002a..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,14 +49,27 @@
return zfCollectionService.selectDataList(zfCollection, pageNum, pageSize);
}
+ @GetMapping("/type")
+ public AjaxResult listType(){
+ return zfCollectionService.listType();
+ }
+
+ /**
+ * 鏍规嵁id鏌ヨ
+ */
+ @GetMapping()
+ public AjaxResult listById(Long id){
+ return AjaxResult.success(zfCollectionService.getById(id));
+ }
+
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getExportModel(HttpServletResponse response){
List<ZfCollectionExcelBean> list = Collections.singletonList(new ZfCollectionExcelBean());
ExcelUtil<ZfCollectionExcelBean> util = new ExcelUtil<>(ZfCollectionExcelBean.class);
- util.exportExcel(response,list,"鏀惰棌鑽ｈ獕璁板綍鏁版嵁");
+ util.exportExcel(response,list,"鏀惰棌鑽ｈ獕瀵煎叆妯℃澘");
}
/**
@@ -68,6 +81,19 @@
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);
log.info("瀵煎嚭璁板綍涓�:{}",list);
ExcelUtil<ZfCollection> util = new ExcelUtil<>(ZfCollection.class);
util.exportExcel(response, list, "鏀惰棌鍜岃崳瑾夎褰曟暟鎹�");
@@ -102,7 +128,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfCollection zfCollection)
{
- return zfCollectionService.addData2(zfCollection);
+ return zfCollectionService.addData(zfCollection);
}
/**
@@ -113,7 +139,7 @@
@PutMapping
public AjaxResult edit(@RequestBody ZfCollection zfCollection)
{
- return toAjax(zfCollectionService.updateById(zfCollection));
+ return zfCollectionService.updateData(zfCollection);
}
//
/**
@@ -124,7 +150,7 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
- return toAjax(zfCollectionService.removeByIds(Arrays.asList(ids)));
+ return zfCollectionService.deleteData(ids);
}
--
Gitblit v1.9.1