From b1643b619696f2578e22d7f3bcc2cacca63a1ce6 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 26 五月 2024 22:26:25 +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/ZfCleanController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCleanController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCleanController.java
index ed7e7d4..bbf8e0a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCleanController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCleanController.java
@@ -71,6 +71,19 @@
ExcelUtil<ZfClean> util = new ExcelUtil<>(ZfClean.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<ZfClean> list = zfCleanService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZfClean> util = new ExcelUtil<>(ZfClean.class);
+ util.exportExcel(response, list, "淇濇磥鏀剁撼璁板綍鏁版嵁");
+ }
/**
* 瀵煎叆淇濇磥鏀剁撼璁板綍鍒楄〃
@@ -101,7 +114,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfClean zfClean)
{
- return zfCleanService.addData2(zfClean);
+ return zfCleanService.addData(zfClean);
}
/**
@@ -112,7 +125,7 @@
@PutMapping
public AjaxResult edit(@RequestBody ZfClean zfClean)
{
- return toAjax(zfCleanService.updateById(zfClean));
+ return zfCleanService.updateData(zfClean);
}
//
/**
@@ -123,7 +136,7 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
- return toAjax(zfCleanService.removeByIds(Arrays.asList(ids)));
+ return zfCleanService.deleteData(ids);
}
}
--
Gitblit v1.9.1