二供排行修改

sms_water/src/main/java/com/huaxu/service/impl/OnlineMonitorImpl.java

@@ -121,18 +121,21 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
             BigDecimal yieldWaterUsage=monitorDataReportServiceImpl.getAmountCount(null,mon.getSceneId().intValue(),"泵站",3,2);
             mon.setYieldWaterUsage(yieldWaterUsage.doubleValue());
         }
+
+
         //按水量倒序排序 如果是水源按照取水量排序，其他按照供水量
-        result.sort(new Comparator<MonitorDataCollectDto>() {
-            @Override
-            public int compare(MonitorDataCollectDto o1, MonitorDataCollectDto o2) {
-                Double d1 = monitorDataCollectDto.getSceneTypeName().equals("水源") ? (o1.getIntakeWaterUsage() == null ? 0d : o1.getIntakeWaterUsage()) : (o1.getYieldWaterUsage() == null ? 0d : o1.getYieldWaterUsage());
-                Double d2 = monitorDataCollectDto.getSceneTypeName().equals("水源") ? (o2.getIntakeWaterUsage() == null ? 0d : o2.getIntakeWaterUsage()) : (o2.getYieldWaterUsage() == null ? 0d : o2.getYieldWaterUsage());
-                if (d1 > d2) {
-                    return -1;
-                }
-                return 0;
-            }
-        });
+//        result.sort(new Comparator<MonitorDataCollectDto>() {
+//            @Override
+//            public int compare(MonitorDataCollectDto o1, MonitorDataCollectDto o2) {
+//                Double d1 = monitorDataCollectDto.getSceneTypeName().equals("水源") ? (o1.getIntakeWaterUsage() == null ? 0d : o1.getIntakeWaterUsage()) : (o1.getYieldWaterUsage() == null ? 0d : o1.getYieldWaterUsage());
+//                Double d2 = monitorDataCollectDto.getSceneTypeName().equals("水源") ? (o2.getIntakeWaterUsage() == null ? 0d : o2.getIntakeWaterUsage()) : (o2.getYieldWaterUsage() == null ? 0d : o2.getYieldWaterUsage());
+//                if (d1 > d2) {
+//                    return -1;
+//                }
+//                return 0;
+//            }
+//        });
+        result.sort(Comparator.comparing(MonitorDataCollectDto::getYieldWaterUsage,Comparator.nullsFirst(Double::compareTo)).reversed());
 
         return result;
     }