From 4ac4fbae929696ce0151de667139ad46d094a589 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 06 一月 2026 18:28:21 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 36 +++++++-----------------------------
1 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index d72d586..af08088 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -2183,13 +2183,16 @@
String endTime1 = null;
String endTime2 = null;
- List<TChargingGun> allGun = chargingGunClient.getAllGun().getData();
- List<TChargingPile> allPile = chargingGunClient.getAllPile().getData();
-
if (StringUtils.hasLength(dto.getStartTime())) {
String[] split = dto.getStartTime().split(" - ");
startTime1 = split[0];
startTime2 = split[1];
+ }
+
+ if (StringUtils.hasLength(dto.getEndTime())) {
+ String[] split = dto.getEndTime().split(" - ");
+ endTime1 = split[0];
+ endTime2 = split[1];
}
if (StringUtils.hasLength(dto.getPhone())) {
List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData();
@@ -2255,32 +2258,7 @@
}
}
dto.setSiteIds(siteIds);
- List<Site> sites = siteClient.getSiteAll().getData();
- // 不分页
- PageInfo<ChargingOrderListVO> pageInfo1 = new PageInfo<>(1, 999999999);
- List<ChargingOrderListVO> list1 = this.baseMapper.chargingList(pageInfo1, dto, startTime1, startTime2, endTime1, endTime2);
- for (ChargingOrderListVO chargingOrderListVO : list1) {
- List<Integer> integers = new ArrayList<>();
- integers.add(chargingOrderListVO.getSiteId());
- Site site = sites.stream().filter(e -> e.getId().equals(chargingOrderListVO.getSiteId())).findFirst().orElse(null);
- if (site != null) {
- chargingOrderListVO.setSiteName(site.getName());
- }
- if (chargingOrderListVO.getStartTime() != null && chargingOrderListVO.getEndTime() != null) {
- LocalDateTime startTime = chargingOrderListVO.getStartTime();
- LocalDateTime endTime = chargingOrderListVO.getEndTime();
- // 计算时间差 单位秒
- long between = ChronoUnit.SECONDS.between(startTime, endTime);
- chargingOrderListVO.setChargingSecond(between);
- }
- if (chargingOrderListVO.getChargingGunId() != null && chargingOrderListVO.getChargingPileId() != null) {
- TChargingGun data1 = allGun.stream().filter(e -> e.getId().equals(chargingOrderListVO.getChargingGunId())).findFirst().orElse(null);
- TChargingPile data2 = allPile.stream().filter(e -> e.getId().equals(chargingOrderListVO.getChargingPileId())).findFirst().orElse(null);
- if (data2 != null && data1 != null) {
- chargingOrderListVO.setTerminalName(data2.getName() + "-" + data1.getName());
- }
- }
- }
+ List<ChargingOrderListVO> list1 = this.baseMapper.chargingList(dto, startTime1, startTime2, endTime1, endTime2);
return list1;
}
--
Gitblit v1.7.1