huanghongfa
2021-05-12 10bd357463eccc8233e030a4c604774bfa0662eb
修改bug
7个文件已修改
3个文件已添加
248 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulCultureLevelEnum.java 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulMarriageEnum.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRelationEnum.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationConfirmServeExcelListen.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EditComMngPopulationVO.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulCultureLevelEnum.java
New file
@@ -0,0 +1,50 @@
package com.panzhihua.common.enums;
import lombok.Getter;
/**
 * 文化程度
 *
 * @author huanghongfa
 */
@Getter
public enum PopulCultureLevelEnum
{
    XX(1, "小学"),
    CZ(2, "初中"),
    GZ(3, "高中"),
    ZZ(4, "中专"),
    DZ(5, "大专"),
    BK(6, "本科"),
    SS(7, "硕士"),
    BS(8, "博士"),
    QT(9, "其他");
    private final Integer code;
    private final String name;
    PopulCultureLevelEnum(Integer code, String name)
    {
        this.code = code;
        this.name = name;
    }
    public static int getCodeByName(String name) {
        for (PopulCultureLevelEnum item : PopulCultureLevelEnum.values()) {
            if (item.name.equals(name)) {
                return item.getCode();
            }
        }
        return 9;
    }
    public static String getCnDescByName(Integer code) {
        for (PopulCultureLevelEnum item : PopulCultureLevelEnum.values()) {
            if (item.code.equals(code)) {
                return item.getName();
            }
        }
        return "其他";
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulMarriageEnum.java
New file
@@ -0,0 +1,47 @@
package com.panzhihua.common.enums;
import lombok.Getter;
/**
 * 婚姻状况
 *
 * @author huanghongfa
 */
@Getter
public enum PopulMarriageEnum
{
    WH(1, "未婚"),
    YH(2, "已婚"),
    LY(3, "离异"),
    SO(4, "丧偶"),
    FJ(5, "分居"),
    QT(6, "其他");
    private final Integer code;
    private final String name;
    PopulMarriageEnum(Integer code, String name)
    {
        this.code = code;
        this.name = name;
    }
    public static int getCodeByName(String name) {
        for (PopulMarriageEnum item : PopulMarriageEnum.values()) {
            if (item.name.equals(name)) {
                return item.getCode();
            }
        }
        return 6;
    }
    public static String getCnDescByName(Integer code) {
        for (PopulMarriageEnum item : PopulMarriageEnum.values()) {
            if (item.code.equals(code)) {
                return item.getName();
            }
        }
        return "其他";
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRelationEnum.java
New file
@@ -0,0 +1,47 @@
package com.panzhihua.common.enums;
import lombok.Getter;
/**
 * 与户主关系
 *
 * @author huanghongfa
 */
@Getter
public enum PopulRelationEnum
{
    HZ(1, "户主"),
    PO(2, "配偶"),
    ZN(3, "子女"),
    SN(4, "孙女"),
    FM(5, "父母"),
    QT(6, "其他");
    private final Integer code;
    private final String name;
    PopulRelationEnum(Integer code, String name)
    {
        this.code = code;
        this.name = name;
    }
    public static int getCodeByName(String name) {
        for (PopulRelationEnum item : PopulRelationEnum.values()) {
            if (item.name.equals(name)) {
                return item.getCode();
            }
        }
        return 6;
    }
    public static String getCnDescByName(Integer code) {
        for (PopulRelationEnum item : PopulRelationEnum.values()) {
            if (item.code.equals(code)) {
                return item.getName();
            }
        }
        return "其他";
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationConfirmServeExcelListen.java
@@ -3,14 +3,13 @@
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.google.common.collect.Lists;
import com.panzhihua.common.enums.PopulIsOkEnum;
import com.panzhihua.common.enums.PopulPoliticalOutlookEnum;
import com.panzhihua.common.enums.PopulSexEnum;
import com.panzhihua.common.enums.*;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.StringUtils;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
@@ -109,7 +108,7 @@
                    vo.setIsRent(PopulIsOkEnum.getCodeByName(oneData.get(4)));
                }
                if(oneData.get(5) != null){
                    vo.setRelation(oneData.get(5));
                    vo.setRelation(PopulRelationEnum.getCodeByName(oneData.get(5)));
                }
                if(oneData.get(6) != null){
                    vo.setRoad(oneData.get(6));
@@ -133,10 +132,10 @@
                    vo.setNativePlace(oneData.get(12));
                }
                if(oneData.get(13) != null){
                    vo.setCultureLevel(oneData.get(13));
                    vo.setCultureLevel(PopulCultureLevelEnum.getCodeByName(oneData.get(13)));
                }
                if(oneData.get(14) != null){
                    vo.setMarriage(oneData.get(14));
                    vo.setMarriage(PopulMarriageEnum.getCodeByName(oneData.get(14)));
                }
                if(oneData.get(15) != null){
                    vo.setHealthy(oneData.get(15));
@@ -144,12 +143,24 @@
                if(oneData.get(16) != null){
                    vo.setWorkCompany(oneData.get(16));
                }
                if(oneData.get(17) != null){
                    vo.setRemark(oneData.get(17));
                if(oneData.get(17) != null && StringUtils.isNotEmpty(oneData.get(17))){
                    String outOrLocal = oneData.get(17);
                    if(outOrLocal.equals(ComMngPopulationServeExcelVO.outOrLocal.bd)){
                        vo.setOutOrLocal(1);
                    }else if(outOrLocal.equals(ComMngPopulationServeExcelVO.outOrLocal.wd)){
                        vo.setOutOrLocal(2);
                    }
                }
                for (int i = 18; i < headSize; i++) {
                if(oneData.get(18) != null){
                    vo.setCensusRegister(oneData.get(18));
                }
                if(oneData.get(19) != null){
                    vo.setRemark(oneData.get(19));
                }
                for (int i = 20; i < headSize; i++) {
                    if (oneData.get(i) != null && oneData.get(i).equals("是")) {
                        vo.getUserTagStr().add(headData.get(i));
                        vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
                    }
                }
                voList.add(vo);
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
@@ -5,9 +5,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists;
import com.panzhihua.common.enums.PopulIsOkEnum;
import com.panzhihua.common.enums.PopulPoliticalOutlookEnum;
import com.panzhihua.common.enums.PopulSexEnum;
import com.panzhihua.common.enums.*;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngPopulationImportErrorVO;
@@ -142,7 +140,7 @@
                    vo.setIsRent(PopulIsOkEnum.getCodeByName(oneData.get(4)));
                }
                if(oneData.get(5) != null){
                    vo.setRelation(oneData.get(5));
                    vo.setRelation(PopulRelationEnum.getCodeByName(oneData.get(5)));
                }
                if(oneData.get(6) != null){
                    vo.setRoad(oneData.get(6));
@@ -166,10 +164,10 @@
                    vo.setNativePlace(oneData.get(12));
                }
                if(oneData.get(13) != null){
                    vo.setCultureLevel(oneData.get(13));
                    vo.setCultureLevel(PopulCultureLevelEnum.getCodeByName(oneData.get(13)));
                }
                if(oneData.get(14) != null){
                    vo.setMarriage(oneData.get(14));
                    vo.setMarriage(PopulMarriageEnum.getCodeByName(oneData.get(14)));
                }
                if(oneData.get(15) != null){
                    vo.setHealthy(oneData.get(15));
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
@@ -29,8 +29,8 @@
    @ExcelProperty(value = "是否租住", index = 4)
    private Integer isRent;
    @ExcelProperty(value = "与户主关系", index = 5)
    private String relation;
    @ExcelProperty(value = "与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)", index = 5)
    private Integer relation;
    @ExcelProperty(value = "街路巷", index = 6)
    private String road;
@@ -53,11 +53,11 @@
    @ExcelProperty(value = "籍贯", index = 12)
    private String nativePlace;
    @ExcelProperty(value = "文化程度", index = 13)
    private String cultureLevel;
    @ExcelProperty(value = "文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)", index = 13)
    private Integer cultureLevel;
    @ExcelProperty(value = "婚姻状况", index = 14)
    private String marriage;
    @ExcelProperty(value = "婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)", index = 14)
    private Integer marriage;
    @ExcelProperty(value = "健康状况", index = 15)
    private String healthy;
@@ -65,7 +65,7 @@
    @ExcelProperty(value = "工作单位", index = 16)
    private String workCompany;
    @ExcelProperty(value = "外地or本地", index = 17)
    @ExcelProperty(value = "外地or本地(1.本地  2.外地)", index = 17)
    private Integer outOrLocal;
    @ExcelProperty(value = "户口所在地", index = 18)
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
@@ -124,7 +124,7 @@
    @ApiModelProperty("小区名字")
    private String alley;
    @ApiModelProperty("户主关系")
    @ApiModelProperty("户主关系列表")
    private List<ComHouseMemberVo> comMngFamilyInfoVOS;
    @ApiModelProperty("家庭成员信息")
@@ -137,11 +137,11 @@
    @NotBlank(groups = {AddGroup.class},message = "是否租住不可为空")
    private Integer isRent;
    @ApiModelProperty("文化程度")
    private String cultureLevel;
    @ApiModelProperty("文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)")
    private Integer cultureLevel;
    @ApiModelProperty("婚姻状况")
    private String marriage;
    @ApiModelProperty("婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)")
    private Integer marriage;
    @ApiModelProperty("健康状况")
    private String healthy;
@@ -152,6 +152,9 @@
    @ApiModelProperty("户口所在地")
    private String censusRegister;
    @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
    private Integer relation;
    public interface sex{
        int nan = 1;
        int nv = 2;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EditComMngPopulationVO.java
@@ -105,23 +105,28 @@
    @ApiModelProperty("小区名字")
    private String alley;
    @ApiModelProperty("是否租住 是否租住(0.否 1.是)")
    @NotBlank(groups = {AddGroup.class},message = "是否租住不可为空")
    private Integer isRent;
    @ApiModelProperty("文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)")
    private Integer cultureLevel;
    @ApiModelProperty("文化程度")
    private String cultureLevel;
    @ApiModelProperty("婚姻状况")
    private String marriage;
    @ApiModelProperty("婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)")
    private Integer marriage;
    @ApiModelProperty("健康状况")
    private String healthy;
    @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
    private Integer relation;
    @ApiModelProperty("外地or本地(1.本地  2.外地)")
    private Integer outOrLocal;
    @ApiModelProperty("户口所在地")
    private String censusRegister;
    public interface sex{
        int nan = 1;
        int nv = 2;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -123,6 +123,9 @@
            "cmp.native_place,\n" +
            "cmp.nation, \n" +
            "cmp.label, \n" +
            "cmp.relation, \n" +
            "cmp.marriage, \n" +
            "cmp.culture_level, \n" +
            "cmp.is_rent \n" +
            "FROM \n" +
            "com_mng_population AS cmp " +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java
@@ -130,19 +130,19 @@
    private String villageName;
    /**
     * 与户主关系
     * 与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)
     */
    private String relation;
    private Integer relation;
    /**
     * 文化程度
     * 文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)
     */
    private String cultureLevel;
    private Integer cultureLevel;
    /**
     * 婚姻状况
     * 婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)
     */
    private String marriage;
    private Integer marriage;
    /**
     * 健康状况