autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 11:35:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 运营商查询订单报表做分页

Browse Source
This commit is contained in:
Lemon
2023-06-16 09:13:34 +08:00
parent fbcf65569a
commit 4791c1ed4a
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.jsowell.pile.service.impl;
import com.github.pagehelper.PageInfo;
import com.jsowell.common.core.page.PageResponse;
import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.PageUtils;
import com.jsowell.common.util.StringUtils;
@@ -105,8 +106,8 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
*/
@Override
public MerchantOrderReportVO getMerchantOrderReport(MerchantOrderReportDTO dto) {
int pageNum = dto.getPageNum() == 0 ? 1 : dto.getPageNum();
int pageSize = dto.getPageSize() == 0 ? 10 : dto.getPageSize();
int pageNum = dto.getPageNum() == null ? 1 : dto.getPageNum();
int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize();
if (StringUtils.isBlank(dto.getStartTime())) {
dto.setStartTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(new Date(), -7)));
}
@@ -122,7 +123,17 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
}
PageInfo<SettleOrderReportVO> pageInfo = new PageInfo<>(list);
vo.setMerchantId(dto.getMerchantId());
vo.setReportList(pageInfo.getList());
// vo.setReportList(pageInfo.getList());
PageResponse pageResponse = PageResponse.builder()
.pageSize(pageSize)
.pageNum(pageNum)
.pages(pageInfo.getPages())
.total(pageInfo.getTotal())
.list(pageInfo.getList())
.build();
vo.setPageResponse(pageResponse);
// 进行数据汇总
// 用电度数
report.setUseElectricity(list.stream().map(SettleOrderReportVO::getUseElectricity).reduce(BigDecimal.ZERO, BigDecimal::add));

5
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantOrderReportVO.java
View File

@@ -1,5 +1,6 @@
package com.jsowell.pile.vo.web;
import com.jsowell.common.core.page.PageResponse;
import com.jsowell.pile.domain.SettleOrderReport;
import lombok.Data;
@@ -12,7 +13,9 @@ public class MerchantOrderReportVO {
private MerchantOrderReport merchantOrderReport;
private List<SettleOrderReportVO> reportList;
// private List<SettleOrderReportVO> reportList;
private PageResponse pageResponse;
@Data
public static class MerchantOrderReport{