diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java index d4426e0bf..dff6fbb0c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java @@ -366,4 +366,6 @@ public interface OrderBasicInfoMapper { * @return */ List queryOrderListByStationId(String stationId); + + List queryOrderByOccupyTime(QueryOrderDTO dto); } \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java index a779eb6cf..f45937369 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java @@ -453,4 +453,11 @@ public interface OrderBasicInfoService{ * @return */ List queryOrderListByStationId(String stationId); + + /** + * 按占用时间查询订单 + * @param dto + * @return + */ + List queryOrderByOccupyTime(QueryOrderDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 4d1f86183..b748fe063 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -3727,5 +3727,10 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { return orderVOS; } + @Override + public List queryOrderByOccupyTime(QueryOrderDTO dto) { + return orderBasicInfoMapper.queryOrderByOccupyTime(dto); + } + } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java index 119900aeb..8c2d22050 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java @@ -325,6 +325,7 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService { dto.setStartTime(DateUtils.formatDateTime(startTime)); dto.setEndTime(DateUtils.formatDateTime(endTime)); List orderListVOS = orderBasicInfoService.selectOrderBasicInfoList(dto); + orderListVOS = orderBasicInfoService.queryOrderByOccupyTime(dto); /* 计算充电时长 diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index c5167b05f..c5bb1aa2f 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -2904,4 +2904,53 @@ AND t1.charge_start_time = ]]> DATE_SUB( CURDATE(), INTERVAL 1 DAY ) AND t1.charge_start_time CURDATE() + + \ No newline at end of file