From e9573dc619e9a1e17d511c5ea4ab461919955be2 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 24 三月 2025 15:17:03 +0800
Subject: [PATCH] 合同终止时间修改
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java | 79 +++++++++++++++++++++++++++++++++++----
1 files changed, 71 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
index 38f218b..cee2df3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
@@ -1,16 +1,16 @@
package com.ruoyi.system.model;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.ruoyi.common.core.domain.BaseModel;
import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
@@ -32,10 +32,43 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_bill")
@ApiModel(value="TBill对象", description="租金账单")
-public class TBill extends BaseModel {
+public class TBill implements Serializable {
private static final long serialVersionUID = 1L;
+ /**
+ * 新增执行
+ */
+ @ApiModelProperty(value = "记录创建人，前端忽略")
+ @JsonIgnore
+ @TableField(value = "create_by", fill = FieldFill.INSERT)
+ private String createBy;
+ /**
+ * 新增和更新执行
+ */
+ @ApiModelProperty(value = "记录修改人，前端忽略")
+ @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
+ private String updateBy;
+ /**
+ * 删除 未删除
+ */
+ @JsonIgnore
+ @TableField("`disabled`")
+ @TableLogic
+ private Boolean disabled;
+
+ @ApiModelProperty(value = "记录创建时间，前端忽略")
+ @TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
+
+ /**
+ * 最后修改时间
+ */
+ @ApiModelProperty(value = "记录修改时间，前端忽略")
+ @TableField("update_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateTime;
@TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
@@ -54,7 +87,7 @@
@ApiModelProperty(value = "应缴费日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("payable_fees_time")
- private LocalDateTime payableFeesTime;
+ private LocalDate payableFeesTime;
@ApiModelProperty(value = "缴费状态 1=未缴费 2=待确认 3=已缴费 4=已逾期 5= 已失效")
@TableField("pay_fees_status")
@@ -65,7 +98,7 @@
private BigDecimal payFeesMoney;
@ApiModelProperty(value = "缴费日期")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("pay_fees_time")
private LocalDateTime payFeesTime;
@@ -73,7 +106,7 @@
@TableField("pay_fees_type")
private Integer payFeesType;
- @ApiModelProperty(value = "账单类型 1=租金 2=押金 3=生活费用")
+ @ApiModelProperty(value = "账单类型 1=租金 2=押金 3=生活费用 4=房屋验收")
@TableField("bill_type")
private String billType;
@@ -111,6 +144,31 @@
@TableField("confirm_id")
private String confirmId;
+ @ApiModelProperty(value = "短信发送状态：0.未发送 1.已发送 2.发送失败")
+ @TableField("sms_status")
+ private Integer smsStatus;
+
+ @ApiModelProperty(value = "短信最后发送时间")
+ @TableField("sms_last_time")
+ private Date smsLastTime;
+
+ @ApiModelProperty(value = "最后短信发送人")
+ @TableField("sms_send_userid")
+ private String smsSendUserid;
+
+
+ @ApiModelProperty(value = "邮件发送状态：0.未发送 1.已发送 2.发送失败")
+ @TableField("mail_status")
+ private Integer mailStatus;
+
+ @ApiModelProperty(value = "邮件最后发送时间")
+ @TableField("mail_last_time")
+ private Date mailLastTime;
+
+ @ApiModelProperty(value = "最后邮件发送人")
+ @TableField("mail_send_userid")
+ private String mailSendUserid;
+
/**
* 抵扣金额
*/
@@ -122,4 +180,9 @@
@TableField(exist = false)
private BigDecimal preOutstand;
+
+
+
+
+
}
--
Gitblit v1.7.1