From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/house/entity/HouseRentalEntity.java | 59 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/entity/HouseRentalEntity.java b/src/main/java/org/springblade/modules/house/entity/HouseRentalEntity.java
index 12ef69d..b7e5d4c 100644
--- a/src/main/java/org/springblade/modules/house/entity/HouseRentalEntity.java
+++ b/src/main/java/org/springblade/modules/house/entity/HouseRentalEntity.java
@@ -16,10 +16,7 @@
*/
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;
@@ -43,6 +40,7 @@
@TableName("jczz_house_rental")
@ApiModel(value = "HouseRental对象", description = "出租屋")
public class HouseRentalEntity implements Serializable {
+ private static final long serialVersionUID = 1L;
/**
* 主键
@@ -58,51 +56,60 @@
@ApiModelProperty(value = "门牌地址编码")
private String houseCode;
/**
- * 房屋名称
+ * 租客关系 1: 同一户 2：不同一户
*/
- @ApiModelProperty(value = "房屋名称")
- private String houseName;
- /**
- * 租客关系(WGCCP_TENANT_RELATIONSHIP)
- */
- @ApiModelProperty(value = "租客关系(WGCCP_TENANT_RELATIONSHIP)")
- private String tenantRelationship;
+ @ApiModelProperty(value = "租客关系 1: 同一户 2：不同一户")
+ private Integer tenantRelationship;
/**
* 租房时间
*/
@ApiModelProperty(value = "租房时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date rentalTime;
/**
* 到期时间
*/
@ApiModelProperty(value = "到期时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date dueTime;
+
/**
- * 房屋状态(WGCCP_HOUSE_STATUS)
+ * 终止时间
*/
- @ApiModelProperty(value = "房屋状态(WGCCP_HOUSE_STATUS)")
- private String houseStatus;
+ @ApiModelProperty(value = "终止时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date terminationTime;
+
/**
- * 租房用途
+ * 房屋状态 1：部分出租 2：全部出租
*/
- @ApiModelProperty(value = "租房用途")
- private String rentalUse;
+ @ApiModelProperty(value = "房屋状态 1：部分出租 2：全部出租")
+ private Integer houseStatus;
+ /**
+ * 租房用途 1：仓库 2：办公 3：商用 4：居住
+ */
+ @ApiModelProperty(value = "租房用途 1：仓库 2：办公 3：商用 4：居住")
+ private Integer rentalUse;
+ /**
+ * 审核状态 0: 待确认 1: 已确认
+ */
+ @ApiModelProperty(value = "审核状态 0: 待审核 1: 审核通过 2: 审核不通过 10未到期； 20即将到期 ；30 已到期")
+ private Integer auditStatus;
/**
* 合同附件URL
*/
@ApiModelProperty(value = "合同附件URL")
private String fileUrls;
- /**
- * 审核状态
- */
- @ApiModelProperty(value = "审核状态")
- private Integer auditStatus;
+
/**
* 创建人
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("创建人")
- private String createUser;
+ private Long createUser;
/**
* 创建时间
@@ -110,6 +117,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;
/**
@@ -117,7 +125,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("更新人")
- private String updateUser;
+ private Long updateUser;
/**
* 更新时间
@@ -125,6 +133,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("更新时间")
+ @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
/**
--
Gitblit v1.9.3