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 dae620a4e..d99508514 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 bbc2909f2..5aeecd75a 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 e5fa8949a..de6b1c57d 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 9ab8329c4..198f3829f 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 @@ -324,7 +324,7 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService { // 查询在占桩期间创建的订单 dto.setStartTime(DateUtils.formatDateTime(startTime)); dto.setEndTime(DateUtils.formatDateTime(endTime)); - List orderListVOS = orderBasicInfoService.selectOrderBasicInfoList(dto); + List 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 600c0a0b7..428d84dc0 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