Merge remote-tracking branch 'origin/feature/dev' into feature/dev

airport-blocked/src/main/java/com/sundot/airport/blocked/service/impl/BlockedMissCheckStatisticsScreenServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sundot.airport.blocked.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.sundot.airport.blocked.domain.BlockedMissCheckStatistics;
 import com.sundot.airport.blocked.mapper.BlockedMissCheckStatisticsMapper;
 import com.sundot.airport.blocked.service.IBlockedMissCheckStatisticsScreenService;
@@ -11,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -70,6 +72,11 @@ public class BlockedMissCheckStatisticsScreenServiceImpl implements IBlockedMiss
             item.setTotal(BigDecimal.valueOf(monthlyAssessmentMap.getOrDefault(sysDictData.getDictValue(), 0L)));
             result.add(item);
         });
+        BigDecimal sum = result.stream().map(BaseCommonDto::getTotal).reduce(BigDecimal.ZERO, BigDecimal::add);
+        result.forEach(item -> {
+            item.setScale(sum.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : item.getTotal().divide(sum, 4, RoundingMode.HALF_UP));
+            item.setScaleDesc(item.getScale().multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP) + "%");
+        });
         return result;
     }
 
@@ -109,6 +116,11 @@ public class BlockedMissCheckStatisticsScreenServiceImpl implements IBlockedMiss
             item.setTotal(BigDecimal.valueOf(value));
             result.add(item);
         });
+        BigDecimal sum = result.stream().map(BaseCommonDto::getTotal).reduce(BigDecimal.ZERO, BigDecimal::add);
+        result.forEach(item -> {
+            item.setScale(sum.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : item.getTotal().divide(sum, 4, RoundingMode.HALF_UP));
+            item.setScaleDesc(item.getScale().multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP) + "%");
+        });
         return result;
     }