huanghongfa
2022-03-07 185a7856f904fc032db78938502a1e6a3a14ab8c
修改bug
1个文件已修改
40 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -7017,21 +7017,29 @@
            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));
            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);
@@ -7665,7 +7673,7 @@
    /**
     * 综治后台-居民列表
     *
     *
     * @param populationListDTO
     *            请求参数
     * @return 居民列表
@@ -7705,7 +7713,7 @@
    /**
     * 综治后台-删除居民
     *
     *
     * @param ids
     *            居民id集合
     * @return 删除结果
@@ -7747,7 +7755,7 @@
    /**
     * 查询平台人口列表
     *
     *
     * @param populationDTO
     *            请求参数
     * @return 人口列表
@@ -7772,7 +7780,7 @@
    /**
     * 综治后台-居民标签栏统计
     *
     *
     * @return 居民统计
     */
    @Override
@@ -7782,7 +7790,7 @@
    /**
     * 综治后台-居民导出查询居民数据
     *
     *
     * @param populationExportDTO
     *            请求参数
     * @return 导出结果
@@ -7830,7 +7838,7 @@
    /**
     * 综治后台-居民管理小区列表
     *
     *
     * @param name
     *            小区名字
     * @return 小区列表
@@ -8331,7 +8339,7 @@
    /**
     * 判重方法
     *
     *
     * @param key
     *            主键
     * @param hashMap
@@ -8441,4 +8449,4 @@
        return bigScreenGridStaticsReturn;
    }
}
}