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/service/impl/DistanceRecordServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/waterdata/service/impl/DistanceRecordServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/waterdata/service/impl/DistanceRecordServiceImpl.java
index b31941f..56298f6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/waterdata/service/impl/DistanceRecordServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/waterdata/service/impl/DistanceRecordServiceImpl.java
@@ -23,9 +23,11 @@
import cn.gistack.by.waterdata.pojo.wrapper.DistanceRecordWrapper;
import cn.gistack.by.waterdata.service.api.IDistanceRecordService;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
@@ -44,17 +46,25 @@
* @param param {@link SelectPageParam}
* @return
*/
- public List<DistanceRecordVO> selectPage(SelectPageParam param) {
+ public IPage<DistanceRecordVO> selectPage(SelectPageParam param) {
List<DistanceRecord> distanceRecords = this.baseMapper.selectPage(param);
+ int subTableRecordsCount = this.baseMapper.getSubTableCount4Page(param);
List<DistanceRecordVO> recordVOList = new ArrayList<>(distanceRecords.size());
for (DistanceRecord distanceRecord : distanceRecords) {
DistanceRecordVO distanceRecordVO = DistanceRecordWrapper.build().entityVO(distanceRecord);
- distanceRecordVO.setInitDistance(param.getInitDistance());
- distanceRecordVO.setDistanceOffset(distanceRecordVO.getDistance() - distanceRecordVO.getInitDistance());
+ distanceRecordVO.setInitDistance(new DecimalFormat("#.##").format(param.getInitDistance()));
+ distanceRecordVO.setDistanceOffset(new DecimalFormat("#.##")
+ .format(distanceRecordVO.getDistance() - param.getInitDistance()));
recordVOList.add(distanceRecordVO);
}
- return recordVOList;
+
+ Page page = new Page();
+ page.setCurrent(param.getCurrentPageIndex());
+ page.setSize(param.getPageSize());
+ page.setRecords(recordVOList);
+ page.setTotal(subTableRecordsCount);
+ return page;
}
@Override
--
Gitblit v1.9.3