|
@ -3286,6 +3286,20 @@ public class StatisticsESService {
|
|
|
}
|
|
|
}
|
|
|
rs.add(map);
|
|
|
Collections.sort(rs, new Comparator<Map<String, Object>>() {
|
|
|
public int compare(Map<String, Object> o1, Map<String, Object> o2) {
|
|
|
Integer map1value = Integer.valueOf(String.valueOf(o1.get("val")));
|
|
|
Integer map2value = Integer.valueOf(String.valueOf(o2.get("val")));
|
|
|
|
|
|
if (map1value - map2value > 0) {
|
|
|
return -1;
|
|
|
} else if (map1value - map2value < 0) {
|
|
|
return 1;
|
|
|
} else {
|
|
|
return 0;
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
return rs;
|
|
|
}
|
|
|
|
|
@ -3509,6 +3523,20 @@ public class StatisticsESService {
|
|
|
|
|
|
rs.add(map);
|
|
|
}
|
|
|
Collections.sort(rs, new Comparator<Map<String, Object>>() {
|
|
|
public int compare(Map<String, Object> o1, Map<String, Object> o2) {
|
|
|
Integer map1value = Integer.valueOf(String.valueOf(o1.get("val")));
|
|
|
Integer map2value = Integer.valueOf(String.valueOf(o2.get("val")));
|
|
|
|
|
|
if (map1value - map2value > 0) {
|
|
|
return -1;
|
|
|
} else if (map1value - map2value < 0) {
|
|
|
return 1;
|
|
|
} else {
|
|
|
return 0;
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
return rs;
|
|
|
}
|
|
|
|
|
@ -3864,6 +3892,20 @@ public class StatisticsESService {
|
|
|
countList.add(map);
|
|
|
}
|
|
|
}
|
|
|
Collections.sort(countList, new Comparator<Map<String, Object>>() {
|
|
|
public int compare(Map<String, Object> o1, Map<String, Object> o2) {
|
|
|
Double map1value = Double.valueOf(String.valueOf(o1.get("val")));
|
|
|
Double map2value = Double.valueOf(String.valueOf(o2.get("val")));
|
|
|
|
|
|
if (map1value - map2value > 0) {
|
|
|
return -1;
|
|
|
} else if (map1value - map2value < 0) {
|
|
|
return 1;
|
|
|
} else {
|
|
|
return 0;
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
return countList;
|
|
|
}
|
|
|
|