修改bug

huanghongfa

2021-06-01 0063ba470b8d6db99d7786ec1fdceb1703ba985a

修改bug

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulCultureLevelEnum.java

@@ -35,7 +35,7 @@
                return item.getCode();
            }
        }
        return 9;
        return -1;
    }

    public static String getCnDescByName(Integer code) {

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulHouseControlStatusEnum.java

@@ -29,7 +29,7 @@
                return item.getCode();
            }
        }
        return 0;
        return -1;
    }

    public static String getCnDescByName(Integer code) {

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulHousePurposeEnum.java

@@ -31,7 +31,7 @@
                return item.getCode();
            }
        }
        return 5;
        return -1;
    }

    public static String getCnDescByName(Integer code) {

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulHouseStatusEnum.java

@@ -29,7 +29,7 @@
                return item.getCode();
            }
        }
        return 3;
        return -1;
    }

    public static String getCnDescByName(Integer code) {

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulIsOkEnum.java

@@ -27,7 +27,7 @@
                return item.getCode();
            }
        }
        return 0;
        return -1;
    }

    public static String getCnDescByName(Integer code) {

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulMarriageEnum.java

@@ -32,7 +32,7 @@
                return item.getCode();
            }
        }
        return 6;
        return -1;
    }

    public static String getCnDescByName(Integer code) {

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulOutOrLocalEnum.java

@@ -28,7 +28,7 @@
                return item.getCode();
            }
        }
        return 0;
        return -1;
    }

    public static String getCnDescByName(Integer code) {

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulPoliticalOutlookEnum.java

@@ -38,7 +38,7 @@
                return item.getCode();
            }
        }
        return 13;
        return -1;
    }

    public static String getCnDescByName(Integer code) {

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRelationEnum.java

@@ -32,7 +32,7 @@
                return item.getCode();
            }
        }
        return 6;
        return -1;
    }

    public static String getCnDescByName(Integer code) {

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/RealAssetsFloorType.java

@@ -10,7 +10,7 @@
@Getter
public enum RealAssetsFloorType
{
    HIGN(1, "高层"), CENTRE(2, "中层"), LOW(2, "底层");
    HIGN(1, "高层"), CENTRE(2, "中层"), LOW(3, "底层");

    private final int code;
    private final String info;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java

@@ -135,16 +135,52 @@
                    }
                }
                if(StringUtils.isNotEmpty(oneData.get(2))){
                    String nation = oneData.get(2);
                    if(!nation.contains("族")){
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                        importErrorVO.setErrorPosition("第" + index + "行，第3列");
                        importErrorVO.setErrorMsg("您填写的民族格式有误");
                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        continue;
                    }
                    vo.setNation(oneData.get(2));
                }
                if(StringUtils.isNotEmpty(oneData.get(3))){
                    vo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCodeByName(oneData.get(3)));
                    Integer isOk = PopulPoliticalOutlookEnum.getCodeByName(oneData.get(3));
                    if(isOk.equals(-1)){
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                        importErrorVO.setErrorPosition("第" + index + "行，第4列");
                        importErrorVO.setErrorMsg("您填写的政治面貌有误");
                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        continue;
                    }
                    vo.setPoliticalOutlook(isOk);
                }
                if(StringUtils.isNotEmpty(oneData.get(4))){
                    vo.setIsRent(PopulIsOkEnum.getCodeByName(oneData.get(4)));
                    Integer isOk = PopulIsOkEnum.getCodeByName(oneData.get(4));
                    if(isOk.equals(-1)){
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                        importErrorVO.setErrorPosition("第" + index + "行，第5列");
                        importErrorVO.setErrorMsg("您填写的是否租住有误");
                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        continue;
                    }
                    vo.setIsRent(isOk);
                }
                if(StringUtils.isNotEmpty(oneData.get(5))){
                    vo.setRelation(PopulRelationEnum.getCodeByName(oneData.get(5)));
                    Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(5));
                    if(isOk.equals(-1)){
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                        importErrorVO.setErrorPosition("第" + index + "行，第6列");
                        importErrorVO.setErrorMsg("您填写的与户主关系有误");
                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        continue;
                    }
                    vo.setRelation(isOk);
                }
                if(StringUtils.isEmpty(oneData.get(6))){
                    ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
@@ -198,10 +234,28 @@
                    vo.setNativePlace(oneData.get(12).trim());
                }
                if(StringUtils.isNotEmpty(oneData.get(13))){
                    vo.setCultureLevel(PopulCultureLevelEnum.getCodeByName(oneData.get(13).trim()));
                    Integer isOk = PopulCultureLevelEnum.getCodeByName(oneData.get(13));
                    if(isOk.equals(-1)){
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                        importErrorVO.setErrorPosition("第" + index + "行，第14列");
                        importErrorVO.setErrorMsg("您填写的文化程度有误");
                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        continue;
                    }
                    vo.setCultureLevel(isOk);
                }
                if(StringUtils.isNotEmpty(oneData.get(14))){
                    vo.setMarriage(PopulMarriageEnum.getCodeByName(oneData.get(14).trim()));
                    Integer isOk = PopulMarriageEnum.getCodeByName(oneData.get(14));
                    if(isOk.equals(-1)){
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                        importErrorVO.setErrorPosition("第" + index + "行，第14列");
                        importErrorVO.setErrorMsg("您填写的婚姻状况有误");
                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        continue;
                    }
                    vo.setMarriage(isOk);
                }
                if(StringUtils.isNotEmpty(oneData.get(15))){
                    vo.setHealthy(oneData.get(15).trim());
@@ -216,19 +270,64 @@
                    vo.setCensusRegister(oneData.get(18).trim());
                }
                if(StringUtils.isNotEmpty(oneData.get(19))){
                    vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName(oneData.get(19).trim()));
                    Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(19));
                    if(isOk.equals(-1)){
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                        importErrorVO.setErrorPosition("第" + index + "行，第20列");
                        importErrorVO.setErrorMsg("您填写的外地or本地有误");
                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        continue;
                    }
                    vo.setOutOrLocal(isOk);
                }
                if(StringUtils.isNotEmpty(oneData.get(20))){
                    vo.setHouseStatus(PopulHouseStatusEnum.getCodeByName(oneData.get(20).trim()));
                    Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(20));
                    if(isOk.equals(-1)){
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                        importErrorVO.setErrorPosition("第" + index + "行，第21列");
                        importErrorVO.setErrorMsg("您填写的房屋状态有误");
                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        continue;
                    }
                    vo.setHouseStatus(isOk);
                }
                if(StringUtils.isNotEmpty(oneData.get(21))){
                    vo.setHousePurpose(PopulHousePurposeEnum.getCodeByName(oneData.get(21).trim()));
                    Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(21));
                    if(isOk.equals(-1)){
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                        importErrorVO.setErrorPosition("第" + index + "行，第22列");
                        importErrorVO.setErrorMsg("您填写的房屋用途有误");
                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        continue;
                    }
                    vo.setHousePurpose(isOk);
                }
                if(StringUtils.isNotEmpty(oneData.get(22))){
                    vo.setControlStatus(PopulHouseControlStatusEnum.getCodeByName(oneData.get(22).trim()));
                    Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(22));
                    if(isOk.equals(-1)){
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                        importErrorVO.setErrorPosition("第" + index + "行，第23列");
                        importErrorVO.setErrorMsg("您填写的管控状态有误");
                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        continue;
                    }
                    vo.setControlStatus(isOk);
                }
                if(StringUtils.isNotEmpty(oneData.get(23))){
                    vo.setIsResidence(PopulIsOksEnum.getCodeByName(oneData.get(23).trim()));
                    Integer isOk = PopulIsOksEnum.getCodeByName(oneData.get(23));
                    if(isOk.equals(-1)){
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                        importErrorVO.setErrorPosition("第" + index + "行，第23列");
                        importErrorVO.setErrorMsg("您填写的是否是居住地有误");
                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        continue;
                    }
                    vo.setIsResidence(isOk);
                }
                for (int i = 24; i < headSize; i++) {
                    if (oneData.get(i) != null && oneData.get(i).equals("是")) {

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

@@ -169,4 +169,16 @@
    @ApiModelProperty(value="是否租住(0.否 1.是)")
    private Integer isRent;

    /**
     * 外地or本地（1.本地  2.外地）
     */
    @ApiModelProperty(value="外地or本地（1.本地  2.外地）")
    private Integer outOrLocal;

    @ApiModelProperty(value="房屋地址等级")
    private Integer level;

    @ApiModelProperty(value="房屋id")
    private Long houseId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java

@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.helper.sensitive.Sensitive;
@@ -111,9 +112,11 @@
    private String label;

    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty("修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;

    @ApiModelProperty("籍贯")

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java

@@ -135,6 +135,7 @@
            "cmp.census_register, \n" +
            "cmp.healthy, \n" +
            "cmp.birthday, \n" +
            "cmp.update_at, \n" +
            "cmp.is_rent \n" +
            "FROM \n" +
            "com_mng_population AS cmp " +
@@ -146,6 +147,9 @@
            "<if test='comMngPopulationVO.actId != null'>" +
            " and cmp.act_id = #{comMngPopulationVO.actId} " +
            " </if> " +
            "<if test='comMngPopulationVO.outOrLocal != null'>" +
            " and cmp.out_or_local = #{comMngPopulationVO.outOrLocal} " +
            " </if> " +
            "<if test='comMngPopulationVO.villageId != null'>" +
            " and cmp.village_id = #{comMngPopulationVO.villageId} " +
            " </if> " +

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

@@ -10,10 +10,13 @@
import com.panzhihua.common.model.vos.community.ComMngPopulationHouseDetailAdminVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationHouseTotalVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationHouseUserAdminVO;
import com.panzhihua.service_community.dao.ComActVillageDAO;
import com.panzhihua.service_community.dao.ComMngPopulationHouseDAO;
import com.panzhihua.service_community.dao.ComMngPopulationHouseUserDAO;
import com.panzhihua.service_community.model.dos.ComMngPopulationHouseDO;
import com.panzhihua.service_community.model.dos.ComMngVillageDO;
import com.panzhihua.service_community.service.ComMngPopulationHouseService;
import com.panzhihua.service_community.service.ComMngVillageService;
import lombok.extern.slf4j.Slf4j;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.BeanUtils;
@@ -35,6 +38,8 @@

    @Resource
    private ComMngPopulationHouseUserDAO comMngPopulationHouseUserDAO;
    @Resource
    private ComActVillageDAO comActVillageDAO;

    /**
     * 查询房屋级联菜单
@@ -60,7 +65,8 @@
                break;
            case 2:
                if(houseDO != null){
                    cascadeHouseVOList = this.baseMapper.getHouseLevelByHouseNum(houseDO.getAlley(),cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
                    ComMngVillageDO villageDO = comActVillageDAO.selectById(houseDO.getVillageId());
                    cascadeHouseVOList = this.baseMapper.getHouseLevelByHouseNum(villageDO.getAlley(),cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
                    cascadeHouseVOList = cascadeHouseVOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley() + ";" + o.getHouseNum()))), ArrayList::new));
                    cascadeHouseVOList.forEach(cascade -> {
                        cascade.setName(cascade.getHouseNum());
@@ -69,7 +75,8 @@
                break;
            case 3:
                if(houseDO != null) {
                    cascadeHouseVOList = this.baseMapper.getHouseLevelByFloor(houseDO.getAlley(), houseDO.getHouseNum(), cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
                    ComMngVillageDO villageDO = comActVillageDAO.selectById(houseDO.getVillageId());
                    cascadeHouseVOList = this.baseMapper.getHouseLevelByFloor(villageDO.getAlley(), villageDO.getHouseNum(), cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
                    cascadeHouseVOList = cascadeHouseVOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley() + ";" + o.getHouseNum() + ";" + o.getFloor()))), ArrayList::new));
                    cascadeHouseVOList.forEach(cascade -> {
                        cascade.setName(cascade.getFloor());

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

@@ -198,6 +198,42 @@
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);

        if(comMngPopulationVO.getHouseId() != null){
            ComMngPopulationHouseDO houseDO = comMngPopulationHouseDAO.selectById(comMngPopulationVO.getHouseId());
            if(houseDO != null){
                switch (comMngPopulationVO.getLevel()){
                    case 1:
                        comMngPopulationVO.setRoad(houseDO.getAlley());
                        break;
                    case 2:
                        comMngPopulationVO.setRoad(houseDO.getAlley());
                        comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
                        break;
                    case 3:
                        comMngPopulationVO.setRoad(houseDO.getAlley());
                        comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
                        comMngPopulationVO.setFloor(houseDO.getFloor());
                        break;
                    case 4:
                        comMngPopulationVO.setRoad(houseDO.getAlley());
                        comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
                        comMngPopulationVO.setFloor(houseDO.getFloor());
                        comMngPopulationVO.setUnitNo(houseDO.getUnitNo());
                        break;
                    case 5:
                        comMngPopulationVO.setRoad(houseDO.getAlley());
                        comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
                        comMngPopulationVO.setFloor(houseDO.getFloor());
                        comMngPopulationVO.setUnitNo(houseDO.getUnitNo());
                        comMngPopulationVO.setHouseNo(houseDO.getHouseNo());
                        break;
                    default:
                        break;
                }
            }
        }

        IPage<ComMngPopulationVO> iPage = populationDAO.pagePopulation(page, comMngPopulationVO);
        if(!iPage.getRecords().isEmpty()){
            iPage.getRecords().forEach(populDO -> {
@@ -308,6 +344,7 @@
                    populationHouseDO.setUnitNo(vo.getUnitNo());
                    populationHouseDO.setHouseNo(vo.getHouseNo());
                    populationHouseDO.setAddress(address);
                    populationHouseDO.setUpdateAt(new Date());
                    if(StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())){
                        populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
                    }
@@ -587,6 +624,12 @@
            return R.fail();
        }
        BeanUtils.copyProperties(vo,populationDO);
        if(StringUtils.isEmpty(vo.getLabel())){
            populationDO.setLabel(null);
        }
        if(StringUtils.isEmpty(vo.getRemark())){
            populationDO.setRemark(null);
        }
        populationDO.setCardNo(null);
        populationDO.setPhone(AESUtil.encrypt128(vo.getPhone(), aesKey));