From cedaeeed6d401aefebf93ea6ea21cc9e06d5f5db Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 02 十二月 2025 10:36:48 +0800
Subject: [PATCH] 新增搜索 模块+同伴+时间
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCleanController.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 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 d464645..1f630c1 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
@@ -9,6 +9,7 @@
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZfClean;
+import com.ruoyi.domain.excel.ZfCleanExcelBean;
import com.ruoyi.service.ZfCleanService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -17,6 +18,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
@@ -42,7 +44,18 @@
public AjaxResult listAll(ZfClean zfClean){
Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+
return zfCleanService.selectDataList(zfClean, pageNum, pageSize);
+ }
+
+ /**
+ * 鑾峰彇瀵煎叆妯℃澘
+ */
+ @PostMapping("/model")
+ public void getExportModel(HttpServletResponse response){
+ List<ZfCleanExcelBean> list = Collections.singletonList(new ZfCleanExcelBean());
+ ExcelUtil<ZfCleanExcelBean> util = new ExcelUtil<>(ZfCleanExcelBean.class);
+ util.exportExcel(response,list,"淇濇磥鏀剁撼瀵煎叆妯℃澘");
}
@@ -55,6 +68,19 @@
public void export(HttpServletResponse response, ZfClean zfClean)
{
List<ZfClean> list = zfCleanService.selectByCondition(zfClean);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ 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, "淇濇磥鏀剁撼璁板綍鏁版嵁");
@@ -89,7 +115,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfClean zfClean)
{
- return zfCleanService.addData2(zfClean);
+ return zfCleanService.addData(zfClean);
}
/**
@@ -100,7 +126,7 @@
@PutMapping
public AjaxResult edit(@RequestBody ZfClean zfClean)
{
- return toAjax(zfCleanService.updateById(zfClean));
+ return zfCleanService.updateData(zfClean);
}
//
/**
@@ -111,7 +137,7 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
- return toAjax(zfCleanService.removeByIds(Arrays.asList(ids)));
+ return zfCleanService.deleteData(ids);
}
}
--
Gitblit v1.9.1