住户导入修改

zhongrj

2024-03-20 ced3a95b1d42c70453fdca63ce67af2ae3fa014e

住户导入修改

 src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java

@@ -57,9 +57,9 @@
    @ApiModelProperty(value = "角色")
    private Integer roleType;
    /**
     * 与角色关系
     * 与业主关系
     */
    @ApiModelProperty(value = "与角色关系")
    @ApiModelProperty(value = "与业主关系")
    private Integer relationship;

    /**

 src/main/java/org/springblade/modules/house/excel/HouseAndHoldExcel.java

@@ -93,22 +93,10 @@
    @ExcelProperty( "姓名")
    private String name;

    /** 绑定用户--无用 */
    @ColumnWidth(15)
    @ExcelProperty( "绑定用户")
    @ExcelIgnore
    private String bingUser;

    /** 手机号 */
    @ColumnWidth(15)
    @ExcelProperty( "手机号")
    private String phoneNumber;

    /** 角色  */
    @ColumnWidth(15)
    @ExcelProperty( value = "角色",converter = ExcelDictConverter.class)
    @ExcelDictItemLabel(type = "roleType")
    private String roleType;

    /** 与角色关系（业主，父子，其他） */
    @ColumnWidth(15)

 src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java

@@ -301,6 +301,7 @@
        QueryWrapper<HouseholdEntity> wrapper = new QueryWrapper<>();
        wrapper.eq("house_code", houseAndHoldExcel.getHouseCode())
            .eq("is_deleted", 0)
            .eq("id_card", houseAndHoldExcel.getIdCard())
            .eq("name", houseAndHoldExcel.getName());
        HouseholdEntity one = householdService.getOne(wrapper);
        // 不存在则插入，存在则不操作
@@ -309,9 +310,6 @@
            householdEntity.setHouseCode(houseAndHoldExcel.getHouseCode());
            householdEntity.setName(houseAndHoldExcel.getName());
            householdEntity.setPhoneNumber(houseAndHoldExcel.getPhoneNumber());
            if (!Strings.isBlank(houseAndHoldExcel.getRoleType())) {
                householdEntity.setRoleType(Integer.parseInt(houseAndHoldExcel.getRoleType()));
            }
            // 与角色关系
            if (!Strings.isBlank(houseAndHoldExcel.getRelationship())) {
                householdEntity.setRelationship(Integer.parseInt(houseAndHoldExcel.getRelationship()));
@@ -332,7 +330,12 @@
            if (!Strings.isBlank(houseAndHoldExcel.getGender())) {
                householdEntity.setGender(Short.parseShort(houseAndHoldExcel.getGender()));
            }
            householdEntity.setIdCard(houseAndHoldExcel.getIdCard());
            // 居民身份证
            if (!Strings.isBlank(houseAndHoldExcel.getIdCard())) {
                // 身份证类型为居民身份证
                householdEntity.setCardType(111);
                householdEntity.setIdCard(houseAndHoldExcel.getIdCard());
            }
            // 党员
            if (!Strings.isBlank(houseAndHoldExcel.getPartyEmber())) {
                householdEntity.setPartyEmber(Integer.parseInt(houseAndHoldExcel.getPartyEmber()));
@@ -381,6 +384,7 @@
            householdEntity.setEmployer(houseAndHoldExcel.getEmployer());
            householdEntity.setOccupation(houseAndHoldExcel.getOccupation());
            householdEntity.setCmpyRegAddr(houseAndHoldExcel.getCmpyRegAddr());
            // 外出
            householdEntity.setGoOutReason(houseAndHoldExcel.getGoOutReason());
            if (!Strings.isBlank(houseAndHoldExcel.getGoOutTime())) {
                try {
@@ -396,9 +400,11 @@
            if (!Strings.isBlank(houseAndHoldExcel.getMaritalStatus())) {
                householdEntity.setMaritalStatus(Integer.parseInt(houseAndHoldExcel.getMaritalStatus()));
            }
            // 车牌号
            householdEntity.setCardNumber(houseAndHoldExcel.getCardNumber());
            // 其他联系方式
            householdEntity.setOtherContact(houseAndHoldExcel.getOtherContact());
            if (Strings.isBlank(householdEntity.getHouseCode())) {
            if (!Strings.isBlank(householdEntity.getHomeAdcode())) {
                // 暂时不处理，导入数据目前都有house_code
                String adCode = shiftResidentHomeAdcode(houseAndHoldExcel.getHomeAdcode());
                // 转换行政区code
@@ -441,9 +447,6 @@
            one.setHouseCode(houseAndHoldExcel.getHouseCode());
            one.setName(houseAndHoldExcel.getName());
            one.setPhoneNumber(houseAndHoldExcel.getPhoneNumber());
            if (!Strings.isBlank(houseAndHoldExcel.getRoleType())) {
                one.setRoleType(Integer.parseInt(houseAndHoldExcel.getRoleType()));
            }
            // 与角色关系
            if (!Strings.isBlank(houseAndHoldExcel.getRelationship())) {
                one.setRelationship(Integer.parseInt(houseAndHoldExcel.getRelationship()));
@@ -464,13 +467,16 @@
            if (!Strings.isBlank(houseAndHoldExcel.getGender())) {
                one.setGender(Short.parseShort(houseAndHoldExcel.getGender()));
            }
            one.setIdCard(houseAndHoldExcel.getIdCard());
            // 居民身份证
            if (!Strings.isBlank(houseAndHoldExcel.getIdCard())) {
                // 身份证类型为居民身份证
                one.setCardType(111);
                one.setIdCard(houseAndHoldExcel.getIdCard());
            }
            // 党员
            if (!Strings.isBlank(houseAndHoldExcel.getPartyEmber())) {
                one.setPartyEmber(Integer.parseInt(houseAndHoldExcel.getPartyEmber()));
            }
            // one.setHkmtPass(houseAndHoldExcel.getHkmtPass());
            // one.setPassport(houseAndHoldExcel.getPassport());
            // 民族
            if (!Strings.isBlank(houseAndHoldExcel.getEthnicity())) {
                one.setEthnicity(Integer.parseInt(houseAndHoldExcel.getEthnicity()));
@@ -530,7 +536,7 @@
            }
            one.setCardNumber(houseAndHoldExcel.getCardNumber());
            one.setOtherContact(houseAndHoldExcel.getOtherContact());
            if (Strings.isBlank(one.getHouseCode())) {
            if (!Strings.isBlank(one.getHomeAdcode())) {
                // 暂时不处理，导入数据目前都有house_code
                String adCode = shiftResidentHomeAdcode(houseAndHoldExcel.getHomeAdcode());
                // 转换行政区code