From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计
---
src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java | 135 +++++++++++++++++++++++++++++++-------------
1 files changed, 95 insertions(+), 40 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java b/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
index b25ceb4..65c621b 100644
--- a/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
+++ b/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
@@ -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;
@@ -29,7 +10,6 @@
import java.io.Serializable;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
-import sun.rmi.runtime.Log;
/**
* 住户 实体类
@@ -72,19 +52,14 @@
@ApiModelProperty(value = "绑定用户ID")
private Long associatedUserId;
/**
- * 绑定用户名称
- */
- @ApiModelProperty(value = "绑定用户名称")
- private String associatedUserName;
- /**
* 角色
*/
@ApiModelProperty(value = "角色")
private Integer roleType;
/**
- * 与角色关系
+ * 与业主关系
*/
- @ApiModelProperty(value = "与角色关系")
+ @ApiModelProperty(value = "与业主关系")
private Integer relationship;
/**
@@ -118,15 +93,15 @@
@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;
/**
* 民族
*/
@@ -138,20 +113,82 @@
@ApiModelProperty(value = "学历")
private Integer education;
/**
- * 户籍登记地
+ * 户籍类型 业务字典：residentType
*/
- @ApiModelProperty(value = "户籍登记地")
+ @ApiModelProperty(value = "户籍类型 业务字典：residentType")
+ private Integer residentType;
+ /**
+ * 户籍登记地（户籍地址）
+ */
+ @ApiModelProperty(value = "户籍登记地（户籍地址）")
private String hukouRegistration;
+ /**
+ * 户籍地行政区划
+ */
+ @ApiModelProperty(value = "户籍地行政区划")
+ private String residentAdcode;
+ /**
+ * 籍贯地行政区划
+ */
+ @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 = "工作单位")
+ @ApiModelProperty(value = "工作单位(就职单位)")
private String employer;
+ /**
+ * 职业类别
+ */
+ @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;
/**
* 婚姻状态
*/
@@ -168,9 +205,14 @@
@ApiModelProperty(value = "其他联系方式")
private String otherContact;
/**
- * 现居住地址
+ * 居住地行政区划
*/
- @ApiModelProperty(value = "现居住地址")
+ @ApiModelProperty(value = "居住地行政区划")
+ private String homeAdcode;
+ /**
+ * 现居住地址(居住地址)
+ */
+ @ApiModelProperty(value = "现居住地址(居住地址)")
private String currentAddress;
/**
* 残疾证
@@ -197,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;
/**
@@ -212,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;
/**
@@ -233,4 +277,15 @@
@ApiModelProperty("是否审核 0:否：1 是")
private Integer confirmFlag;
+ /**
+ * 出租屋id
+ */
+ @ApiModelProperty("出租屋id")
+ private Long housingRentalId;
+
+ /** 自愿者组织 */
+ @ApiModelProperty(value = "自愿者组织", example = "")
+ @TableField("volunteer_org")
+ private String volunteerOrg;
+
}
--
Gitblit v1.9.3