From 41d53f6e09c11c2c6d29958c42feb6dad9bbcb02 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 20 Dec 2024 15:28:27 +0800
Subject: [PATCH] 白蚁新模块。12-20
---
skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/waterdata/service/impl/DistanceRecordServiceImpl.java | 26 ++++++++++++++++++++++----
1 files changed, 22 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..46c9ca5 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
@@ -17,15 +17,18 @@
package cn.gistack.by.waterdata.service.impl;
import cn.gistack.by.waterdata.mapper.DistanceRecordMapper;
+import cn.gistack.by.waterdata.pojo.entity.CsbldFlag;
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.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 +47,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
@@ -66,4 +77,11 @@
public DistanceRecord selectOneById(int id) {
return baseMapper.selectOneById(id);
}
+
+ @Override
+ public CsbldFlag csbldFlag(String skGuid) {
+ return baseMapper.csbldFlag(skGuid);
+ }
+
+
}
--
Gitblit v1.9.3