diff --git a/fuintAdmin/src/views/shopowner.vue b/fuintAdmin/src/views/shopowner.vue index 654bffe7c..a5da928e6 100644 --- a/fuintAdmin/src/views/shopowner.vue +++ b/fuintAdmin/src/views/shopowner.vue @@ -906,6 +906,10 @@ export default { data: times, axisPointer: { type: 'shadow' + }, + axisLabel: { + interval: 0, + // rotate: 30 } } ], @@ -955,6 +959,10 @@ export default { data: showTimes, axisPointer: { type: 'shadow' + }, + axisLabel: { + interval: 0, + // rotate: 30 } } ], diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java index ec53dc94c..484292e76 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java @@ -1883,6 +1883,9 @@ public class AllOrderInfoServiceImpl extends ServiceImpl= 30) { + days = getAllDatesBetweenMonth(DateUtil.beginOfDay(DateUtil.parse(startTime)).toString(), DateUtil.endOfDay(DateUtil.parse(endTime)).toString()); + type = 3; } //根据开始时间与结束时间获取所有天数 //查询所有订单 @@ -1907,6 +1910,11 @@ public class AllOrderInfoServiceImpl extends ServiceImpl getAllDatesBetweenMonth(String startTime, String endTime) { + + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + LocalDateTime startDate = LocalDateTime.parse(startTime, formatter); + LocalDateTime endDate = LocalDateTime.parse(endTime, formatter); + + List dateList = new ArrayList<>(); + while (!startDate.isAfter(endDate)) { + dateList.add(startDate.format(formatter)); + startDate = startDate.plusDays(3); + } + + return dateList; } @@ -2113,6 +2136,9 @@ public class AllOrderInfoServiceImpl extends ServiceImpl= 30) { + allDatesBetween = getAllDatesBetweenMonth(DateUtil.beginOfDay(DateUtil.parse(startTime)).toString(), DateUtil.endOfDay(DateUtil.parse(endTime)).toString()); + type = 3; } List oilNames = new ArrayList<>(); @@ -2138,6 +2164,11 @@ public class AllOrderInfoServiceImpl extends ServiceImpl