From 85b3eb8267cd4cd0975203dbc15991db9065a773 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 06 三月 2025 20:21:10 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 50 insertions(+), 3 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 bb355e1..42b77b4 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
@@ -5,9 +5,11 @@
import com.baomidou.mybatisplus.annotation.TableId;
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;
@@ -18,6 +20,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.data.annotation.Transient;
+import springfox.documentation.annotations.ApiIgnore;
/**
* <p>
@@ -53,7 +56,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")
@@ -64,7 +67,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;
@@ -72,7 +75,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;
@@ -106,5 +109,49 @@
@TableField("voucher")
private String voucher;
+ @ApiModelProperty(value = "t_bill_confirm表确认单关联ID")
+ @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;
+
+ /**
+ * 抵扣金额
+ */
+ @TableField(exist = false)
+ private BigDecimal deductionMoney;
+ /**
+ * 抵扣前欠费金额
+ */
+ @TableField(exist = false)
+ private BigDecimal preOutstand;
+
+
+
+
+
}
--
Gitblit v1.7.1