From 0fe6e0afc66e1034b60a3eb7d2cf3a9e04851abe Mon Sep 17 00:00:00 2001
From: shankai <shankai1995@qq.com>
Date: Fri, 13 Dec 2024 11:38:22 +0800
Subject: [PATCH] by: 修改selectPage接口返回值
---
skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/waterdata/controller/DistanceRecordController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/waterdata/controller/DistanceRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/waterdata/controller/DistanceRecordController.java
index 55854bb..b88b1b7 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/waterdata/controller/DistanceRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/waterdata/controller/DistanceRecordController.java
@@ -17,10 +17,10 @@
package cn.gistack.by.waterdata.controller;
import cn.gistack.by.waterdata.pojo.entity.DistanceRecord;
+import cn.gistack.by.waterdata.pojo.entity.SelectPageParam;
import cn.gistack.by.waterdata.pojo.vo.DistanceRecordVO;
import cn.gistack.by.waterdata.pojo.wrapper.DistanceRecordWrapper;
import cn.gistack.by.waterdata.service.api.IDistanceRecordService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
@@ -71,12 +71,11 @@
/**
* DistanceRecord 分页
*/
- @GetMapping("/list")
- @ApiOperation(value = "分页", notes = "传入DistanceRecord实体对象")
- public R<IPage<DistanceRecordVO>> list(DistanceRecord distanceRecord, Query query) {
- QueryWrapper<DistanceRecord> queryWrapper = Condition.getQueryWrapper(distanceRecord);
- IPage<DistanceRecord> pages = distanceRecordService.page(Condition.getPage(query), queryWrapper);
- return R.data(DistanceRecordWrapper.build().pageVO(pages));
+ @GetMapping("/selectpage")
+ @ApiOperation(value = "自定义分页", notes = "传入SelectPageParam对象")
+ public R<IPage<DistanceRecordVO>> selectPage(SelectPageParam param) {
+ IPage<DistanceRecordVO> page = distanceRecordService.selectPage(param);
+ return R.data(page);
}
/**
--
Gitblit v1.9.3