From 878b7d3bcddaf5bfff49d23796f3473c022853f5 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 29 Dec 2023 09:06:56 +0800
Subject: [PATCH] 时间倒叙，不然新打卡的，都要一页一页往下翻
---
src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java | 116 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 93 insertions(+), 23 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..a813cfe 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;
/**
* 住户 实体类
@@ -118,6 +98,16 @@
@ApiModelProperty(value = "身份证")
private String idCard;
/**
+ * 证件类型，业务字典 cardType
+ */
+ @ApiModelProperty(value = "证件类型，业务字典 cardType")
+ private Integer cardType;
+ /**
+ * 证件号码
+ */
+ @ApiModelProperty(value = "证件号码")
+ private String cardNo;
+ /**
* 港澳台通行证
*/
@ApiModelProperty(value = "港澳台通行证")
@@ -138,20 +128,92 @@
@ApiModelProperty(value = "学历")
private Integer education;
/**
+ * 户籍类型 业务字典：residentType
+ */
+ @ApiModelProperty(value = "户籍类型 业务字典：residentType")
+ private Integer residentType;
+ /**
+ * 户籍地址
+ */
+ @ApiModelProperty(value = "户籍地址")
+ private String residentAddr;
+ /**
* 户籍登记地
*/
@ApiModelProperty(value = "户籍登记地")
private String hukouRegistration;
+ /**
+ * 户籍地址编码
+ */
+ @ApiModelProperty(value = "户籍地址编码")
+ private String residentAddrNo;
+ /**
+ * 户籍地行政区划
+ */
+ @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;
/**
* 婚姻状态
*/
@@ -197,6 +259,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 +275,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 +297,10 @@
@ApiModelProperty("是否审核 0:否：1 是")
private Integer confirmFlag;
+ /**
+ * 出租屋id
+ */
+ @ApiModelProperty("出租屋id")
+ private Long housingRentalId;
+
}
--
Gitblit v1.9.3