平均值默认为0

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

@@ -136,13 +136,13 @@ public class AverageStatisticsAggregate {
                 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;
+                count1 += Double.compare(value1, 0) == 0 ? 0 : 1;
+                count1 += Double.compare(lastValue1, 0) == 0 ? 0 : 1;
+                count1 += Double.compare(lastYearValue1, 0) == 0 ? 0 : 1;
                 Integer count2 = 0;
-                count2 += value2 == null ? 0 : 1;
-                count2 += lastValue2 == null ? 0 : 1;
-                count2 += lastYearValue2 == null ? 0 : 1;
+                count2 += Double.compare(value2, 0) == 0 ? 0 : 1;
+                count2 += Double.compare(lastValue2, 0) == 0 ? 0 : 1;
+                count2 += Double.compare(lastYearValue2, 0) == 0 ? 0 : 1;
                 return (count1 > count2) ? -1 : ((count1 < count2) ? 1 : 0);
             }
         });
@@ -227,13 +227,13 @@ public class AverageStatisticsAggregate {
                 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;
+                count1 += Double.compare(value1, 0) == 0 ? 0 : 1;
+                count1 += Double.compare(lastValue1, 0) == 0 ? 0 : 1;
+                count1 += Double.compare(lastYearValue1, 0) == 0 ? 0 : 1;
                 Integer count2 = 0;
-                count2 += value2 == null ? 0 : 1;
-                count2 += lastValue2 == null ? 0 : 1;
-                count2 += lastYearValue2 == null ? 0 : 1;
+                count2 += Double.compare(value2, 0) == 0 ? 0 : 1;
+                count2 += Double.compare(lastValue2, 0) == 0 ? 0 : 1;
+                count2 += Double.compare(lastYearValue2, 0) == 0 ? 0 : 1;
                 return (count1 > count2) ? -1 : ((count1 < count2) ? 1 : 0);
             }
         });

src/main/java/com/diagbot/dto/AverageStatisticsDTO.java

@@ -14,10 +14,10 @@ public class AverageStatisticsDTO {
     private String id;
     private String name;
     private Integer num;
-    private Double averageValue;
-    private Double totleValue;
+    private Double averageValue=0d;
+    private Double totleValue=0d;
     //环比平均值
-    private Double lastAverageValue;
+    private Double lastAverageValue=0d;
     //同比平均值
-    private Double lastYearAverageValue;
+    private Double lastYearAverageValue=0d;
 }