控制台

src/main/java/com/diagbot/aggregate/AverageStatisticsAggregate.java

@@ -125,6 +125,28 @@ public class AverageStatisticsAggregate {
             retAverageDayNumList.add(item);
         }
 
+        //排序
+        Collections.sort(retAverageDayNumList, new Comparator<AverageStatisticsDTO>() {
+            @Override
+            public int compare(AverageStatisticsDTO o1, AverageStatisticsDTO o2) {
+                Double value1 = o1.getAverageValue();
+                Double lastValue1 = o1.getLastAverageValue();
+                Double lastYearValue1 = o1.getLastYearAverageValue();
+                Double value2 = o2.getAverageValue();
+                Double lastValue2 = o2.getLastAverageValue();
+                Double lastYearValue2 = o2.getLastYearAverageValue();
+                Integer count1 = 0;
+                count1 += value1 == null ? 0 : 1;
+                count1 += lastValue1 == null ? 0 : 1;
+                count1 += lastYearValue1 == null ? 0 : 1;
+                Integer count2 = 0;
+                count2 += value2 == null ? 0 : 1;
+                count2 += lastValue2 == null ? 0 : 1;
+                count2 += lastYearValue2 == null ? 0 : 1;
+                return (count1 > count2) ? 1 : ((count1 < count2) ? -1 : 0);
+            }
+        });
+
         if (retAverageDayNumList.size() > limitCount) {
             retAverageDayNumList = retAverageDayNumList.subList(0, limitCount);
         }