|
@ -3486,14 +3486,14 @@ public class StatisticsEsService {
|
|
|
JSONArray array1 = weekTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_ZL,"2");
|
|
|
JSONArray arraytotal = weekTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_ZL,null);
|
|
|
object.put("data",array);
|
|
|
object.put("data",array1);
|
|
|
object.put("data2",array1);
|
|
|
object.put("data3",arraytotal);
|
|
|
}else if (interval==3){
|
|
|
JSONArray array = monthTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_ZL,"1");
|
|
|
JSONArray array1 = monthTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_ZL,"2");
|
|
|
JSONArray arraytotal = monthTotalStatistics2(startDate,endDate,area,level,indexes[1],null,SaveModel.timeLevel_ZL,null);
|
|
|
object.put("data",array);
|
|
|
object.put("data",array1);
|
|
|
object.put("data2",array1);
|
|
|
object.put("data3",arraytotal);
|
|
|
}
|
|
|
if (StringUtils.isNoneBlank(level2_type)){
|