Browse Source

差值求和优化

yq 4 years ago
parent
commit
682422139b

+ 6 - 6
mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/FireStatisticsServiceImpl.java

@@ -100,12 +100,12 @@ public class FireStatisticsServiceImpl implements FireStatisticsService {
 
         //差集求和
         double sum = list.stream().filter(item -> !orderByList.contains(item)).mapToDouble(FireLevelRatioVO::getRadio).sum();
-        FireLevelRatioVO fireLevelRatioVO = orderByList.stream().filter(item -> "其他".equals(item.getFireType())).findAny().orElse(null);
-        fireLevelRatioVO = Optional.ofNullable(fireLevelRatioVO).map(fireLevelRatio -> {
-                    fireLevelRatio.setRadio(fireLevelRatio.getRadio() + sum);
-                    return fireLevelRatio;
-                }
-        ).orElse(new FireLevelRatioVO());
+        FireLevelRatioVO fireLevelRatioVO = orderByList.stream().filter(item -> "其他".equals(item.getFireType())).findAny()
+                .map(fireLevelRatio -> {
+                            fireLevelRatio.setRadio(fireLevelRatio.getRadio() + sum);
+                            return fireLevelRatio;
+                        }
+                ).orElse(new FireLevelRatioVO());
         if (null == fireLevelRatioVO.getFireType()){
             fireLevelRatioVO.setFireType("其他");
             fireLevelRatioVO.setRadio(sum);