住户导入修改，走访日志删除字段

zhongrj

2024-01-03 e7f4736ae823bb2bce200325dd35457e09b45020

住户导入修改，走访日志删除字段

 src/main/java/org/springblade/modules/grid/entity/GridWorkLogEntity.java

@@ -74,17 +74,17 @@
     */
    @ApiModelProperty(value = "被访人用户id")
    private Long householdId;

    /**
     * 被访人姓名
     */
    @ApiModelProperty(value = "被访人姓名")
    private String name;
    /**
     * 被访人电话
     */
    @ApiModelProperty(value = "被访人电话")
    private String phone;
//
//    /**
//     * 被访人姓名
//     */
//    @ApiModelProperty(value = "被访人姓名")
//    private String name;
//    /**
//     * 被访人电话
//     */
//    @ApiModelProperty(value = "被访人电话")
//    private String phone;
    /**
     * 内容
     */

 src/main/java/org/springblade/modules/grid/vo/GridWorkLogVO.java

@@ -16,6 +16,7 @@
 */
package org.springblade.modules.grid.vo;

import io.swagger.annotations.ApiModelProperty;
import org.springblade.modules.grid.entity.GridWorkLogEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
@@ -31,5 +32,20 @@
@EqualsAndHashCode(callSuper = true)
public class GridWorkLogVO extends GridWorkLogEntity {
    private static final long serialVersionUID = 1L;
    /**
     * 被访人姓名
     */
    @ApiModelProperty(value = "被访人姓名")
    private String name;
    /**
     * 被访人电话
     */
    @ApiModelProperty(value = "被访人电话")
    private String phone;
    /**
     * 被访人地址
     */
    @ApiModelProperty(value = "被访人地址")
    private String address;

}

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

@@ -423,6 +423,8 @@
                        UserHouseLabelEntity userHouseLabelEntity = new UserHouseLabelEntity();
                        userHouseLabelEntity.setLabelId(BigDecimal.valueOf(one1.getId()).longValue());
                        userHouseLabelEntity.setHouseholdId(householdEntity.getId());
                        // 设置默认的绿色
                        userHouseLabelEntity.setColor("#30D17C");
                        userHouseLabelEntity.setLableType(1);
                        userHouseLabelEntity.setLabelName(s);
                        userHouseLabelEntity.setHouseCode(houseAndHoldExcel.getHouseCode());
@@ -475,7 +477,7 @@
            }
            // 户籍类型
            if (!Strings.isBlank(houseAndHoldExcel.getResidentType())){
                one.setResidentType(Integer.parseInt(houseAndHoldExcel.getResidentType()));
                one.setResidentType(Integer.parseInt(houseAndHoldExcel.getResidentType().trim()));
            }
            // 户籍地区县
            if (!Strings.isBlank(houseAndHoldExcel.getResidentAdcode())){