根据年份排序

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/StorageServiceImpl.java

@@ -508,7 +508,7 @@ public class StorageServiceImpl {
         double  tmpInDataArea = 0d;
         double  tmpOutDataArea = 0d;
         for(TrendStatisticsData obj:res){
-            if(Integer.parseInt(obj.getYear())>tmpYear){
+            if("其它".equals(obj.getYear())||Integer.parseInt(obj.getYear())>tmpYear){
                 tmpRes.add(obj);
             }else {
                 tmpInDataArea += Double.parseDouble(obj.getInDataArea());
@@ -517,7 +517,7 @@ public class StorageServiceImpl {
         }
         if(tmpInDataArea>0d || tmpOutDataArea>0d){
             TrendStatisticsData data = new TrendStatisticsData();
-            data.setYear("2026年前");
+            data.setYear("2016年前");
             data.setInDataArea(String.format("%.2f",tmpInDataArea));
             data.setOutDataArea(String.format("%.2f",tmpOutDataArea));
             tmpRes.add(data);
@@ -530,6 +530,8 @@ public class StorageServiceImpl {
                     String y2 = d2.getYear();
                     if("其它".equals(y1)) return 1;
                     if("其它".equals(y2)) return -1;
+                    if("2016年前".equals(y1)) return 1;
+                    if("2016年前".equals(y2)) return -1;
                     return Integer.parseInt(y1)-Integer.parseInt(y2);
                 }).collect(Collectors.toList());
         return res;