实有人口相关修改

101captain

2022-01-18 0a5371a84a03105c67054223e0e3c94b23567275

实有人口相关修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java

@@ -220,6 +220,8 @@

    @ApiModelProperty("是否死亡人员 (1.是 2.否)")
    private Integer isDeath;

    private Integer type;
    public interface levelIsAll{
        int yes = 1;
        int no = 2;

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

@@ -507,6 +507,19 @@
            }
        }

        if(comMngPopulationVO.getType()!=null){
            switch (comMngPopulationVO.getType()){
                case 1 : comMngPopulationVO.setAgeStart("80");
                         comMngPopulationVO.setAgeEnd("89");
                         break;
                case 2 : comMngPopulationVO.setAgeStart("90");
                         comMngPopulationVO.setAgeEnd("99");
                         break;
                case 3 : comMngPopulationVO.setAgeStart("100");
                         break;
            }
        }

        if (StringUtils.isNotEmpty(comMngPopulationVO.getAgeStart())) {
            String ageStartTime = DateUtils.getDateFormatString(
                DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeStart()))), "yyyy-MM-dd");