Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComRehabilitationPopulationDO.java

@@ -1,13 +1,13 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;

import lombok.Data;

/**
 * @auther txb
@@ -23,204 +23,181 @@
    private static final long serialVersionUID = 1L;

    /**
    * 主键id
    */
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    private Long id;

    /**
    * 人口id
    */
     * 人口id
     */
    private Long populationId;

    /**
    * 街道id
    */
     * 街道id
     */
    private Long streetId;

    /**
    * 社区id
    */
     * 社区id
     */
    private Long communityId;

    /**
    * 名字
    */
     * 名字
     */
    private String name;

    /**
    * 身份证号码
    */
     * 身份证号码
     */
    @EncryptDecryptField
    private String cardNo;

    /**
    * 联系电话
    */
     * 联系电话
     */
    private String phone;

    /**
    * 与人员关系
    */
    private Integer patientRelation;
     * 与人员关系
     */
    private String patientRelation;

    /**
    * 列管原因及类型
    */
     * 列管原因及类型
     */
    private String rehabReasonAndType;

    /**
    * 是否列管（1.是 0.否）
    */
     * 是否列管（1.是 0.否）
     */
    private Integer isRehab;

    /**
    * 是否累惯犯（1.是 0.否）
    */
     * 是否累惯犯（1.是 0.否）
     */
    private Integer isRecidivist;

    /**
    * 原判刑期
    */
     * 原判刑期
     */
    private String originalTerm;

    /**
    * 服刑日期
    */
     * 服刑日期
     */
    private Date sentenceBegin;

    /**
    * 原罪名
    */
     * 原罪名
     */
    private String originalCharge;

    /**
    * 释放日期
    */
     * 释放日期
     */
    private Date sentenceEnd;

    /**
    * 服刑场所
    */
     * 服刑场所
     */
    private String sentencePlace;

    /**
    * 危险性评估
    */
     * 危险性评估
     */
    private String riskAssessment;

    /**
    * 衔接日期
    */
     * 衔接日期
     */
    private Date joinDate;

    /**
    * 衔接情况
    */
     * 衔接情况
     */
    private String joinSituation;

    /**
    * 是否重新犯罪（1.是 0.否）
    */
     * 是否重新犯罪（1.是 0.否）
     */
    private Integer isAgainCrime;

    /**
    * 重新犯罪名称
    */
     * 重新犯罪名称
     */
    private String againCrimeName;

    /**
    * 安置情况
    */
     * 安置情况
     */
    private String placeSituation;

    /**
    * 安置日期
    */
     * 安置日期
     */
    private Date placeDate;

    /**
    * 未安置原因
    */
     * 未安置原因
     */
    private String notPlaceReason;

    /**
    * 帮教开始
    */
     * 帮教开始
     */
    private Date helpBegin;

    /**
    * 帮教结束
    */
     * 帮教结束
     */
    private Date helpEnd;

    /**
    * 帮教情况
    */
     * 帮教情况
     */
    private String helpSituation;

    /**
    * 备注
    */
     * 备注
     */
    private String remark;

    /**
    * 创建时间
    */
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
    * 创建用户
    */
     * 创建用户
     */
    private Long createBy;

    /**
    * 修改时间
    */
     * 修改时间
     */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date updateAt;

    /**
    * 修改用户
    */
     * 修改用户
     */
    private Long updateBy;

@Override
public String toString() {
        return "ComRehabilitationPopulationDO{" +
                "id=" + id +
                ", populationId=" + populationId +
                ", streetId=" + streetId +
                ", communityId=" + communityId +
                ", name=" + name +
                ", cardNo=" + cardNo +
                ", phone=" + phone +
                ", patientRelation=" + patientRelation +
                ", rehabReasonAndType=" + rehabReasonAndType +
                ", isRehab=" + isRehab +
                ", isRecidivist=" + isRecidivist +
                ", originalTerm=" + originalTerm +
                ", sentenceBegin=" + sentenceBegin +
                ", originalCharge=" + originalCharge +
                ", sentenceEnd=" + sentenceEnd +
                ", sentencePlace=" + sentencePlace +
                ", riskAssessment=" + riskAssessment +
                ", joinDate=" + joinDate +
                ", joinSituation=" + joinSituation +
                ", isAgainCrime=" + isAgainCrime +
                ", againCrimeName=" + againCrimeName +
                ", placeSituation=" + placeSituation +
                ", placeDate=" + placeDate +
                ", notPlaceReason=" + notPlaceReason +
                ", helpBegin=" + helpBegin +
                ", helpEnd=" + helpEnd +
                ", helpSituation=" + helpSituation +
                ", remark=" + remark +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        }
        }
    @Override
    public String toString() {
        return "ComRehabilitationPopulationDO{" + "id=" + id + ", populationId=" + populationId + ", streetId="
            + streetId + ", communityId=" + communityId + ", name=" + name + ", cardNo=" + cardNo + ", phone=" + phone
            + ", patientRelation=" + patientRelation + ", rehabReasonAndType=" + rehabReasonAndType + ", isRehab="
            + isRehab + ", isRecidivist=" + isRecidivist + ", originalTerm=" + originalTerm + ", sentenceBegin="
            + sentenceBegin + ", originalCharge=" + originalCharge + ", sentenceEnd=" + sentenceEnd + ", sentencePlace="
            + sentencePlace + ", riskAssessment=" + riskAssessment + ", joinDate=" + joinDate + ", joinSituation="
            + joinSituation + ", isAgainCrime=" + isAgainCrime + ", againCrimeName=" + againCrimeName
            + ", placeSituation=" + placeSituation + ", placeDate=" + placeDate + ", notPlaceReason=" + notPlaceReason
            + ", helpBegin=" + helpBegin + ", helpEnd=" + helpEnd + ", helpSituation=" + helpSituation + ", remark="
            + remark + ", createAt=" + createAt + ", createBy=" + createBy + ", updateAt=" + updateAt + ", updateBy="
            + updateBy + "}";
    }
}