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

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2024-07-16 15:42:12 +08:00
parent d04c248958 5f096bd1be
commit 691e319c9d
5 changed files with 64 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
View File

@@ -366,4 +366,6 @@ public interface OrderBasicInfoMapper {
* @return
*/
List<SupStationStatsVO> queryOrderListByStationId(String stationId);
List<OrderListVO> queryOrderByOccupyTime(QueryOrderDTO dto);
}

7
jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
View File

@@ -453,4 +453,11 @@ public interface OrderBasicInfoService{
* @return
*/
List<SupStationStatsVO> queryOrderListByStationId(String stationId);
/**
* 按占用时间查询订单
* @param dto
* @return
*/
List<OrderListVO> queryOrderByOccupyTime(QueryOrderDTO dto);
}

5
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -3727,5 +3727,10 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
return orderVOS;
}
@Override
public List<OrderListVO> queryOrderByOccupyTime(QueryOrderDTO dto) {
return orderBasicInfoMapper.queryOrderByOccupyTime(dto);
}
}

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java
View File

@@ -324,7 +324,7 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService {
// 查询在占桩期间创建的订单
dto.setStartTime(DateUtils.formatDateTime(startTime));
dto.setEndTime(DateUtils.formatDateTime(endTime));
List<OrderListVO> orderListVOS = orderBasicInfoService.selectOrderBasicInfoList(dto);
List<OrderListVO> orderListVOS = orderBasicInfoService.queryOrderByOccupyTime(dto);
/*
计算充电时长