From 29f287cf6e4869d7bbc283991458e09a03b59c52 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 21 一月 2026 14:29:55 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java
index 1109d6b..7c31ca2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java
@@ -1,21 +1,23 @@
package com.ruoyi.web.controller.project;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonatemaintenance;
+import com.ruoyi.project.domain.vo.ServiceDonatemaintenanceVO;
import com.ruoyi.project.service.IServiceDonatemaintenanceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
import java.util.List;
+import java.util.Map;
/**
* 渚涗綋缁存姢璁板綍Controller
@@ -30,16 +32,28 @@
@Autowired
private IServiceDonatemaintenanceService serviceDonatemaintenanceService;
+// /**
+// * 鏌ヨ渚涗綋缁存姢璁板綍鍒楄〃
+// */
+// @ApiOperation("鏌ヨ渚涗綋缁存姢璁板綍鍒楄〃")
+// // @PreAuthorize("@ss.hasPermi('system:donatemaintenance:list')")
+// @PostMapping("/list")
+// public Map<String, Object> list(@RequestBody ServiceDonatemaintenance serviceDonatemaintenance) {
+// Page<ServiceDonatemaintenance> serviceDonatemaintenancePage = serviceDonatemaintenanceService.queryList(serviceDonatemaintenance);
+// return getDataTable(serviceDonatemaintenancePage.getRecords(), (int) serviceDonatemaintenancePage.getTotal());
+// }
+
/**
* 鏌ヨ渚涗綋缁存姢璁板綍鍒楄〃
*/
- @ApiOperation("鏌ヨ渚涗綋缁存姢璁板綍鍒楄〃")
+ @ApiOperation("鑾峰彇渚涗綋缁存姢璁板綍鍩烘湰淇℃伅鍒楄〃")
// @PreAuthorize("@ss.hasPermi('system:donatemaintenance:list')")
- @PostMapping("/list")
- public TableDataInfo list(ServiceDonatemaintenance serviceDonatemaintenance) {
- startPage();
- List<ServiceDonatemaintenance> list = serviceDonatemaintenanceService.queryList(serviceDonatemaintenance);
- return getDataTable(list);
+ @PostMapping("/maintenanceBaseInfoList")
+ public Map<String, Object> maintenanceBaseInfoList(@RequestBody ServiceDonatemaintenanceVO serviceDonatemaintenanceVO) {
+ Integer offset = PageUtils.getOffset(serviceDonatemaintenanceVO.getPageNum(), serviceDonatemaintenanceVO.getPageSize());
+ serviceDonatemaintenanceVO.setPageNum(offset);
+ Page serviceDonatemaintenancePage = serviceDonatemaintenanceService.maintenanceBaseInfoList(serviceDonatemaintenanceVO);
+ return getDataTable(serviceDonatemaintenancePage.getRecords(), (int) serviceDonatemaintenancePage.getTotal());
}
/**
@@ -50,7 +64,8 @@
@Log(title = "渚涗綋缁存姢璁板綍", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonatemaintenance serviceDonatemaintenance) {
- List<ServiceDonatemaintenance> list = serviceDonatemaintenanceService.queryList(serviceDonatemaintenance);
+ Page<ServiceDonatemaintenance> serviceDonatemaintenancePage = serviceDonatemaintenanceService.queryList(serviceDonatemaintenance);
+ List<ServiceDonatemaintenance> list = serviceDonatemaintenancePage.getRecords();
ExcelUtil<ServiceDonatemaintenance> util = new ExcelUtil<ServiceDonatemaintenance>(ServiceDonatemaintenance.class);
return util.exportExcel(list, "渚涗綋缁存姢璁板綍鏁版嵁");
}
--
Gitblit v1.9.3