|
@@ -74,17 +74,19 @@ public class StatisticsServiceImpl implements IStatisticsService {
|
|
|
StatisticsGraphVo statisticsGraphVo = new StatisticsGraphVo();
|
|
StatisticsGraphVo statisticsGraphVo = new StatisticsGraphVo();
|
|
|
String startDate = "";
|
|
String startDate = "";
|
|
|
String endDate = "";
|
|
String endDate = "";
|
|
|
-
|
|
|
|
|
|
|
+ boolean flag=false;
|
|
|
if(flagType.equals("day") || flagType.equals("week") || flagType.equals("month") || flagType.equals("three")){
|
|
if(flagType.equals("day") || flagType.equals("week") || flagType.equals("month") || flagType.equals("three")){
|
|
|
startDate = DateTimeRangeUtils.getStartString(flagType);
|
|
startDate = DateTimeRangeUtils.getStartString(flagType);
|
|
|
endDate = DateTimeRangeUtils.getEndString(flagType);
|
|
endDate = DateTimeRangeUtils.getEndString(flagType);
|
|
|
|
|
+ flag=false;
|
|
|
} else {
|
|
} else {
|
|
|
startDate = startTime;
|
|
startDate = startTime;
|
|
|
endDate = endTime;
|
|
endDate = endTime;
|
|
|
|
|
+ flag=true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// x轴日期
|
|
// x轴日期
|
|
|
- List<String> dates = DateTimeRangeUtils.getDatesBetween(startDate, endDate, false);
|
|
|
|
|
|
|
+ List<String> dates = DateTimeRangeUtils.getDatesBetween(startDate, endDate, flag);
|
|
|
|
|
|
|
|
// 初始化各指标列表,默认值为0
|
|
// 初始化各指标列表,默认值为0
|
|
|
List<Integer> payOrderCountIds = new ArrayList<>(dates.size());
|
|
List<Integer> payOrderCountIds = new ArrayList<>(dates.size());
|