Merge branch 'dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into dev

101captain

2022-03-09 b2a5e4be739b232876b87e65ed70fa5186943d1e

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java

@@ -7017,21 +7017,48 @@
            int count=ageMap.get("age16").intValue()+ageMap.get("age27").intValue()+ageMap.get("age35").intValue()
                    +ageMap.get("age45").intValue()+ageMap.get("age55").intValue()+ageMap.get("age55over").intValue()+ageMap.get("age65").intValue()+ageMap.get("age75").intValue();
            ageStatisticsVO1.setSum(ageMap.get("age16").intValue());
            ageStatisticsVO1.setPercent(BigDecimal.valueOf(ageMap.get("age16").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
            if(count == 0){
                ageStatisticsVO1.setSum(0);
                ageStatisticsVO2.setSum(0);
                ageStatisticsVO3.setSum(0);
                ageStatisticsVO4.setSum(0);
                ageStatisticsVO5.setSum(0);
                ageStatisticsVO6.setSum(0);
                ageStatisticsVO7.setSum(0);
                ageStatisticsVO8.setSum(0);
                ageStatisticsVO1.setPercent(BigDecimal.ZERO);
                ageStatisticsVO2.setPercent(BigDecimal.ZERO);
                ageStatisticsVO3.setPercent(BigDecimal.ZERO);
                ageStatisticsVO4.setPercent(BigDecimal.ZERO);
                ageStatisticsVO5.setPercent(BigDecimal.ZERO);
                ageStatisticsVO6.setPercent(BigDecimal.ZERO);
                ageStatisticsVO7.setPercent(BigDecimal.ZERO);
                ageStatisticsVO8.setPercent(BigDecimal.ZERO);
            }else {
                BigDecimal rate = BigDecimal.valueOf(ageMap.get("age16").intValue() * 100d).divide(BigDecimal.valueOf(count), 2, BigDecimal.ROUND_HALF_UP);
                ageStatisticsVO1.setPercent(rate);
            ageStatisticsVO2.setSum(ageMap.get("age27").intValue());
            ageStatisticsVO2.setPercent(BigDecimal.valueOf(ageMap.get("age27").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
                rate = BigDecimal.valueOf(ageMap.get("age27").intValue() * 100d).divide(BigDecimal.valueOf(count), 2, BigDecimal.ROUND_HALF_UP);
                ageStatisticsVO2.setPercent(rate);
            ageStatisticsVO3.setSum(ageMap.get("age35").intValue());
            ageStatisticsVO3.setPercent(BigDecimal.valueOf(ageMap.get("age35").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
                rate = BigDecimal.valueOf(ageMap.get("age35").intValue() * 100d).divide(BigDecimal.valueOf(count), 2, BigDecimal.ROUND_HALF_UP);
                ageStatisticsVO3.setPercent(rate);
            ageStatisticsVO4.setSum(ageMap.get("age45").intValue());
            ageStatisticsVO4.setPercent(BigDecimal.valueOf(ageMap.get("age45").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
                rate = BigDecimal.valueOf(ageMap.get("age45").intValue() * 100d).divide(BigDecimal.valueOf(count), 2, BigDecimal.ROUND_HALF_UP);
                ageStatisticsVO4.setPercent(rate);
            ageStatisticsVO5.setSum(ageMap.get("age55").intValue());
            ageStatisticsVO5.setPercent(BigDecimal.valueOf(ageMap.get("age55").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
                rate = BigDecimal.valueOf(ageMap.get("age55").intValue() * 100d).divide(BigDecimal.valueOf(count), 2, BigDecimal.ROUND_HALF_UP);
                ageStatisticsVO5.setPercent(rate);
            ageStatisticsVO6.setSum(ageMap.get("age55over").intValue());
            ageStatisticsVO6.setPercent(BigDecimal.valueOf(ageMap.get("age55over").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
                rate = BigDecimal.valueOf(ageMap.get("age55over").intValue() * 100d).divide(BigDecimal.valueOf(count), 2, BigDecimal.ROUND_HALF_UP);
                ageStatisticsVO6.setPercent(rate);
            ageStatisticsVO7.setSum(ageMap.get("age65").intValue());
            ageStatisticsVO7.setPercent(BigDecimal.valueOf(ageMap.get("age65").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
                rate = BigDecimal.valueOf(ageMap.get("age65").intValue() * 100d).divide(BigDecimal.valueOf(count), 2, BigDecimal.ROUND_HALF_UP);
                ageStatisticsVO7.setPercent(rate);
            ageStatisticsVO8.setSum(ageMap.get("age75").intValue());
            ageStatisticsVO8.setPercent(BigDecimal.valueOf(ageMap.get("age75").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
                rate = BigDecimal.valueOf(ageMap.get("age75").intValue() * 100d).divide(BigDecimal.valueOf(count), 2, BigDecimal.ROUND_HALF_UP);
                ageStatisticsVO8.setPercent(rate);
            }
        }

        agePopulationList.add(ageStatisticsVO1);
@@ -7949,7 +7976,11 @@
                            count= comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
                        }
                        specialStatisticsVO.setSum(count);
                        if(countAll == 0){
                            specialStatisticsVO.setPercent(BigDecimal.ZERO);
                        }else{
                        specialStatisticsVO.setPercent(BigDecimal.valueOf(specialStatisticsVO.getSum()*100d/countAll).setScale(2,BigDecimal.ROUND_HALF_UP));
                        }
                        otherSpecialVO1.setSum(otherSpecialVO1.getSum()+count);
                        specialStatisticsVOList.add(specialStatisticsVO);
                    }
@@ -7961,10 +7992,16 @@
                }
            });
        }
        if(countAll == 0){
            otherSpecialVO.setPercent(BigDecimal.ZERO);
            otherSpecialVO1.setPercent(BigDecimal.ZERO);
        }else{
        otherSpecialVO.setPercent(BigDecimal.valueOf(otherSpecialVO.getSum()*100d/countAll).setScale(2,BigDecimal.ROUND_HALF_UP));
            otherSpecialVO1.setPercent(BigDecimal.valueOf(otherSpecialVO1.getSum()*100d/countAll).setScale(2,BigDecimal.ROUND_HALF_UP));
        }
        specialStatisticsVOList.add(otherSpecialVO);
        otherSpecialVO1.setSum(countAll-otherSpecialVO1.getSum());
        otherSpecialVO1.setPercent(BigDecimal.valueOf(otherSpecialVO1.getSum()*100d/countAll).setScale(2,BigDecimal.ROUND_HALF_UP));

        specialStatisticsVOList.add(otherSpecialVO1);
        indexInfo.setSpecialStatisticsVOList(specialStatisticsVOList);
        // 查询网格化治理