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/ZfEventController.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
index 30227a5..9a82850 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
@@ -65,13 +65,11 @@
*/
// @PreAuthorize("@ss.hasPermi('system:property:export')")
@Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
- @PostMapping("/export/{ids}")
- public void export(HttpServletResponse response, ZfEvent zfEvent,@PathVariable Long[] ids) {
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ZfEvent zfEvent) {
List<ZfEvent> list = new ArrayList<>();
- if(ids.length!=0)
- list = zfEventService.selectByIds(ids);
- else
- list = zfEventService.selectByCondition(zfEvent);
+
+ list = zfEventService.selectByCondition(zfEvent);
log.info("瀵煎嚭璁板綍涓�:{}", list);
ExcelUtil<ZfEvent> util = new ExcelUtil<>(ZfEvent.class);
util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
@@ -83,7 +81,7 @@
// @PreAuthorize("@ss.hasPermi('system:property:export')")
@Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
@PostMapping("/export1/{ids}")
- public void export1(HttpServletResponse response, @PathVariable Long[] ids) {
+ public void export(HttpServletResponse response, @PathVariable Long[] ids) {
List<ZfEvent> list = zfEventService.selectByIds(ids);
log.info("瀵煎嚭璁板綍涓�:{}", list);
ExcelUtil<ZfEvent> util = new ExcelUtil<>(ZfEvent.class);
@@ -98,9 +96,7 @@
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception {
-
return zfEventService.importExcel(file);
-
}
/**
@@ -120,7 +116,7 @@
@Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ZfEvent zfEvent) {
- return zfEventService.addData2(zfEvent);
+ return zfEventService.addData(zfEvent);
}
/**
@@ -130,7 +126,7 @@
@Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ZfEvent zfEvent) {
- return toAjax(zfEventService.updateById(zfEvent));
+ return zfEventService.updateData(zfEvent);
}
//
@@ -141,7 +137,7 @@
@Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
- return toAjax(zfEventService.removeByIds(Arrays.asList(ids)));
+ return zfEventService.deleteData(ids);
}
}
--
Gitblit v1.9.1