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
2024-08-12 13:32:54 +08:00
parent ef5eae2744
commit 52619a9b37
2 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
View File

@@ -797,26 +797,27 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
}
}
// 日期区间
String startTime = null;
String endTime = null;
if (dateTime == null) {
// 用户未选中某天时
Date date = null;
if (StringUtils.equals(Constants.ONE, type)) {
// 7天
date = DateUtils.addDays(new Date(), -7);
}else if (StringUtils.equals(Constants.TWO, type)) {
// 30天
date = DateUtils.addDays(new Date(), -30);
}
startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
endTime = DateUtils.dateTimeNow(DateUtils.YYYY_MM_DD);
} else {
// 用户选中某天的数据时↓
startTime = dateTime;
endTime = dateTime;
// String startTime = null;
// String endTime = null;
// 用户未选中某天时
Date date = null;
if (StringUtils.equals(Constants.ONE, type)) {
// 7天
date = DateUtils.addDays(new Date(), -7);
}else if (StringUtils.equals(Constants.TWO, type)) {
// 30天
date = DateUtils.addDays(new Date(), -30);
}
String startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
String endTime = DateUtils.dateTimeNow(DateUtils.YYYY_MM_DD);
// if (dateTime == null) {
//
//
// } else {
// // 用户选中某天的数据时↓
// startTime = dateTime;
// endTime = dateTime;
// }
// 根据站点ids和日期区间查询订单详情
List<BusinessOrderDetailInfoVO> orderDetails = orderBasicInfoService.getOrderDetailByStationIds(stationIds, startTime, endTime);
@@ -966,6 +967,9 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
// 查询订单日报表过去一年的数据
List<SettleOrderReport> list = settleOrderReportService.queryOrderReport(stationIds, startTime, endTime);
if (CollectionUtils.isEmpty(list)) {
throw new BusinessException(ReturnCodeEnum.CODE_SELECT_INFO_IS_NULL);
}
// 按照日期汇总数据
Map<String, SettleOrderReport> collect = list.stream()
.peek(report -> {