jczz_manager.git

			@@ -1,25 +1,6 @@
			/*
			* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
			*
			* Redistribution and use in source and binary forms, with or without
			* modification, are permitted provided that the following conditions are met:
			*
			* Redistributions of source code must retain the above copyright notice,
			* this list of conditions and the following disclaimer.
			* Redistributions in binary form must reproduce the above copyright
			* notice, this list of conditions and the following disclaimer in the
			* documentation and/or other materials provided with the distribution.
			* Neither the name of the dreamlu.net developer nor the names of its
			* contributors may be used to endorse or promote products derived from
			* this software without specific prior written permission.
			* Author: Chill 庄骞 (smallchill@163.com)
			*/
			package org.springblade.modules.house.entity;

			import com.baomidou.mybatisplus.annotation.IdType;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.baomidou.mybatisplus.annotation.TableLogic;
			import com.baomidou.mybatisplus.annotation.TableName;
			import com.baomidou.mybatisplus.annotation.*;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.fasterxml.jackson.databind.annotation.JsonSerialize;
			import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
			@@ -40,6 +21,7 @@
			@TableName("jczz_household")
			@ApiModel(value = "Household对象", description = "住户")
			public class HouseholdEntity implements Serializable {
			private static final long serialVersionUID = 1L;

			/**
			* 主键
			@@ -70,30 +52,34 @@
			@ApiModelProperty(value = "绑定用户ID")
			private Long associatedUserId;
			/**
			* 绑定用户名称
			* 角色
			*/
			@ApiModelProperty(value = "绑定用户名称")
			private String associatedUserName;
			@ApiModelProperty(value = "角色")
			private Integer roleType;
			/**
			* 与角色关系
			* 与业主关系
			*/
			@ApiModelProperty(value = "与角色关系")
			private String relationship;
			@ApiModelProperty(value = "与业主关系")
			private Integer relationship;

			/**
			* 主要联系人
			* 是否主要联系人 1：是 0：否
			*/
			@ApiModelProperty(value = "主要联系人")
			private String primaryContact;
			@ApiModelProperty(value = "是否主要联系人 1：是 0：否")
			private Integer isPrimaryContact;

			/**
			* 居住状态（WGCCP_RESIDENTIAL_STATUS）
			* 居住状态 1: 是 0：否
			*/
			@ApiModelProperty(value = "居住状态（WGCCP_RESIDENTIAL_STATUS）")
			private String residentialStatus;
			@ApiModelProperty(value = "居住状态 1: 是 0：否")
			private Integer residentialStatus;

			/**
			* 性别（SEX）
			* 性别 1: 男 0：女 2: 未知
			*/
			@ApiModelProperty(value = "性别（SEX）")
			@ApiModelProperty(value = "性别 1: 男 0：女 2: 未知")
			private Short gender;

			/**
			* 生日
			*/
			@@ -107,45 +93,107 @@
			@ApiModelProperty(value = "身份证")
			private String idCard;
			/**
			* 港澳台通行证
			* 证件类型，业务字典 cardType
			*/
			@ApiModelProperty(value = "港澳台通行证")
			private String hkmtPass;
			@ApiModelProperty(value = "证件类型，业务字典 cardType")
			private Integer cardType;
			/**
			* 护照
			* 证件号码
			*/
			@ApiModelProperty(value = "护照")
			private String passport;
			@ApiModelProperty(value = "证件号码")
			private String cardNo;
			/**
			* 民族（WGCCP_ETHNICITY）
			* 民族
			*/
			@ApiModelProperty(value = "民族（WGCCP_ETHNICITY）")
			private String ethnicity;
			@ApiModelProperty(value = "民族")
			private Integer ethnicity;
			/**
			* 学历（WGCCP_EDUCATION）
			* 学历
			*/
			@ApiModelProperty(value = "学历（WGCCP_EDUCATION）")
			private String education;
			@ApiModelProperty(value = "学历")
			private Integer education;
			/**
			* 户籍登记地
			* 户籍类型业务字典：residentType
			*/
			@ApiModelProperty(value = "户籍登记地")
			@ApiModelProperty(value = "户籍类型业务字典：residentType")
			private Integer residentType;
			/**
			* 户籍登记地（户籍地址）
			*/
			@ApiModelProperty(value = "户籍登记地（户籍地址）")
			private String hukouRegistration;
			/**
			* 工作状态（WGCCP_WORK_STATUS）
			* 户籍地行政区划
			*/
			@ApiModelProperty(value = "工作状态（WGCCP_WORK_STATUS）")
			private String workStatus;
			@ApiModelProperty(value = "户籍地行政区划")
			private String residentAdcode;
			/**
			* 工作单位
			* 籍贯地行政区划
			*/
			@ApiModelProperty(value = "工作单位")
			@ApiModelProperty(value = "籍贯地行政区划")
			private String nativePlaceAdcode;
			/**
			* 宗教信仰
			*/
			@ApiModelProperty(value = "宗教信仰")
			private String religiousBelief;
			/**
			* 健康状况业务字典 healthStatus
			*/
			@ApiModelProperty(value = "健康状况业务字典 healthStatus")
			private Integer healthStatus;
			/**
			* 疾病名称
			*/
			@ApiModelProperty(value = "疾病名称")
			private String diseaseName;
			/**
			* 工作状态
			*/
			@ApiModelProperty(value = "工作状态")
			private Integer workStatus;
			/**
			* 工作单位(就职单位)
			*/
			@ApiModelProperty(value = "工作单位(就职单位)")
			private String employer;
			/**
			* 婚姻状态（WGCCP_MARITAL_STATUS）
			* 职业类别
			*/
			@ApiModelProperty(value = "婚姻状态（WGCCP_MARITAL_STATUS）")
			private String maritalStatus;
			@ApiModelProperty(value = "职业类别")
			private String occupation;
			/**
			* 就职单位地址
			*/
			@ApiModelProperty(value = "就职单位地址")
			private String cmpyRegAddr;
			/**
			* 外出详址
			*/
			@ApiModelProperty(value = "外出详址")
			private String goOutAddr;
			/**
			* 外出去向
			*/
			@ApiModelProperty(value = "外出去向")
			private String goOutWhere;
			/**
			* 外出时间
			*/
			@ApiModelProperty(value = "外出时间")
			@DateTimeFormat(pattern = "yyyy-MM-dd")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date goOutTime;
			/**
			* 外出原因
			*/
			@ApiModelProperty(value = "外出原因")
			private String goOutReason;
			/**
			* 婚姻状态
			*/
			@ApiModelProperty(value = "婚姻状态")
			private Integer maritalStatus;
			/**
			* 车牌号
			*/
			@@ -157,37 +205,33 @@
			@ApiModelProperty(value = "其他联系方式")
			private String otherContact;
			/**
			* 现居住地址
			* 居住地行政区划
			*/
			@ApiModelProperty(value = "现居住地址")
			@ApiModelProperty(value = "居住地行政区划")
			private String homeAdcode;
			/**
			* 现居住地址(居住地址)
			*/
			@ApiModelProperty(value = "现居住地址(居住地址)")
			private String currentAddress;
			/**
			* 残疾证
			*/
			@ApiModelProperty(value = "残疾证")
			private String disabilityCert;

			/**
			* 数据状态（ENABLED）
			* 是否党员 1：党员 2：群众
			*/
			@ApiModelProperty(value = "数据状态（ENABLED）")
			private Short dataStatus;
			/**
			* 角色
			*/
			@ApiModelProperty(value = "角色")
			private String roleType;
			/**
			* 是否党员
			*/
			@ApiModelProperty(value = "是否党员")
			private String partyEmber;
			@ApiModelProperty(value = "是否党员 1：党员 2：群众")
			private Integer partyEmber;

			/**
			* 创建人
			*/
			@JsonSerialize(using = ToStringSerializer.class)
			@ApiModelProperty("创建人")
			private String createUser;
			private Long createUser;

			/**
			* 创建时间
			@@ -195,6 +239,7 @@
			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			@ApiModelProperty("创建时间")
			@TableField(value = "create_time",fill = FieldFill.INSERT)
			private Date createTime;

			/**
			@@ -202,7 +247,7 @@
			*/
			@JsonSerialize(using = ToStringSerializer.class)
			@ApiModelProperty("更新人")
			private String updateUser;
			private Long updateUser;

			/**
			* 更新时间
			@@ -210,6 +255,7 @@
			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			@ApiModelProperty("更新时间")
			@TableField(value = "update_time",fill = FieldFill.UPDATE)
			private Date updateTime;

			/**
			@@ -221,8 +267,40 @@
			/**
			* 是否删除
			*/
			@TableLogic
			// @TableLogic
			@ApiModelProperty("是否已删除 0:否 1:是")
			private Integer isDeleted;

			/**
			* 是否审核
			*/
			@ApiModelProperty("是否审核 0:否：1 是")
			private Integer confirmFlag;

			/**
			* 出租屋id
			*/
			@ApiModelProperty("出租屋id")
			private Long housingRentalId;

			/** 自愿者组织 */
			@ApiModelProperty(value = "自愿者组织", example = "")
			@TableField("volunteer_org")
			private String volunteerOrg;


			@ApiModelProperty(value = "房东名称", example = "")
			@TableField("landlord_name")
			private String landlordName;


			@ApiModelProperty(value = "房东电话", example = "")
			@TableField("landlord_phone")
			private String landlordPhone;

			@ApiModelProperty(value = "房东身份证", example = "")
			@TableField("landlord_id_card")
			private String landlordIdCard;


			}