From d88fffd5d757a23f302011ced88dea92e1ce31e9 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 30 一月 2026 13:48:20 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 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 7c31ca2..bb57781 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
@@ -9,11 +9,14 @@
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.domain.dto.MaintenanceBaseInfoDTO;
+import com.ruoyi.project.domain.dto.MedicalevaluationBaseInfoDTO;
+import com.ruoyi.project.domain.vo.MaintenanceBaseInfoVO;
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.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -32,28 +35,24 @@
@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("鑾峰彇渚涗綋缁存姢璁板綍鍩烘湰淇℃伅鍒楄〃")
// @PreAuthorize("@ss.hasPermi('system:donatemaintenance: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());
+ public Map<String, Object> maintenanceBaseInfoList(@RequestBody MaintenanceBaseInfoVO maintenanceBaseInfoVO) {
+ Integer offset = PageUtils.getOffset(maintenanceBaseInfoVO.getPageNum(), maintenanceBaseInfoVO.getPageSize());
+ maintenanceBaseInfoVO.setPageNum(offset);
+ List<MaintenanceBaseInfoDTO> maintenanceBaseInfoDTOS = serviceDonatemaintenanceService.maintenanceBaseInfoList(maintenanceBaseInfoVO);
+
+ //鑾峰彇鎬绘暟
+ maintenanceBaseInfoVO.setPageNum(null);
+ maintenanceBaseInfoVO.setPageSize(null);
+ Integer totalCount = 0;
+ List<MaintenanceBaseInfoDTO> total = serviceDonatemaintenanceService.maintenanceBaseInfoList(maintenanceBaseInfoVO);
+ if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
+ return getDataTable(maintenanceBaseInfoDTOS, totalCount);
}
/**
--
Gitblit v1.9.3