From 5fa6e6f8410ef9d057174bcff2a3c5038c54a551 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 18:41:20 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java | 176 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 129 insertions(+), 47 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 f3d2d20..2ea41f2 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,15 +1,23 @@
package com.ruoyi.system.model;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -17,7 +25,7 @@
* </p>
*
* @author xiaochen
- * @since 2025-01-17
+ * @since 2025-01-20
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -26,90 +34,164 @@
public class TBill implements Serializable {
private static final long serialVersionUID = 1L;
+ /**
+ * 新增执行
+ */
+ @ApiModelProperty(value = "记录创建人，前端忽略")
+ @JsonIgnore
+ @TableField(value = "create_by", fill = FieldFill.INSERT)
+ private String createBy;
- @TableId("id")
+ /**
+ * 新增和更新执行
+ */
+ @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;
@ApiModelProperty(value = "合同id")
- @TableField("contractId")
+ @TableField("contract_id")
private String contractId;
+ @ApiModelProperty(value = "营运部门ID")
+ @TableField("business_dept_id")
+ private String businessDeptId;
+
+ @ApiModelProperty(value = "合同编号")
+ @TableField("contract_number")
+ private String contractNumber;
+
@ApiModelProperty(value = "应缴费")
- @TableField("payableFeesMoney")
- private Double payableFeesMoney;
+ @TableField("payable_fees_money")
+ private BigDecimal payableFeesMoney;
@ApiModelProperty(value = "应缴费日期")
- @TableField("payableFeesTime")
- private LocalDateTime payableFeesTime;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @TableField("payable_fees_time")
+ private LocalDate payableFeesTime;
- @ApiModelProperty(value = "缴费状态 1=未缴费 2=待确认 3=已缴费 4=已逾期")
- @TableField("payFeesStatus")
- private Integer payFeesStatus;
+ @ApiModelProperty(value = "缴费状态 1=未缴费 2=待确认 3=已缴费 4=已逾期 5= 已失效")
+ @TableField("pay_fees_status")
+ private String payFeesStatus;
@ApiModelProperty(value = "缴费金额")
- @TableField("payFeesMoney")
- private Double payFeesMoney;
+ @TableField("pay_fees_money")
+ private BigDecimal payFeesMoney;
@ApiModelProperty(value = "缴费日期")
- @TableField("payFeesTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("pay_fees_time")
private LocalDateTime payFeesTime;
@ApiModelProperty(value = "缴费方式 1=线上缴费 =2线下缴费")
- @TableField("payFeesType")
+ @TableField("pay_fees_type")
private Integer payFeesType;
- @ApiModelProperty(value = "账单类型 1=租金 2=押金 3=生活费用")
- @TableField("billType")
- private Integer billType;
+ @ApiModelProperty(value = "账单类型 1=租金 2=押金 3=生活费用 4=房屋验收")
+ @TableField("bill_type")
+ private String billType;
@ApiModelProperty(value = "逾期天数")
- @TableField("overDays")
+ @TableField("over_days")
private Integer overDays;
@ApiModelProperty(value = "应缴违约金")
- @TableField("payableFeesPenalty")
- private Double payableFeesPenalty;
+ @TableField("payable_fees_penalty")
+ private BigDecimal payableFeesPenalty;
@ApiModelProperty(value = "账单周期开始时间")
- @TableField("startTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("start_time")
private LocalDateTime startTime;
@ApiModelProperty(value = "账单周期结束时间")
- @TableField("endTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("end_time")
private LocalDateTime endTime;
@ApiModelProperty(value = "银行流水号")
- @TableField("bankSerialNumber")
+ @TableField("bank_serial_number")
private String bankSerialNumber;
- @ApiModelProperty(value = "实际收款")
- @TableField("actualMoney")
- private Double actualMoney;
+ @ApiModelProperty(value = "欠费金额")
+ @TableField("outstanding_money")
+ private BigDecimal outstandingMoney;
@ApiModelProperty(value = "凭证上传")
@TableField("voucher")
private String voucher;
- @ApiModelProperty(value = "创建时间")
- @TableField("createTime")
- private LocalDateTime createTime;
+ @ApiModelProperty(value = "t_bill_confirm表确认单关联ID")
+ @TableField("confirm_id")
+ private String confirmId;
- @ApiModelProperty(value = "修改时间")
- @TableField("updateTime")
- private LocalDateTime updateTime;
+ @ApiModelProperty(value = "短信发送状态：0.未发送 1.已发送 2.发送失败")
+ @TableField("sms_status")
+ private Integer smsStatus;
- @ApiModelProperty(value = "创建人")
- @TableField("createBy")
- private String createBy;
+ @ApiModelProperty(value = "短信最后发送时间")
+ @TableField("sms_last_time")
+ private Date smsLastTime;
- @ApiModelProperty(value = "修改人")
- @TableField("updateBy")
- private String updateBy;
+ @ApiModelProperty(value = "最后短信发送人")
+ @TableField("sms_send_userid")
+ private String smsSendUserid;
- @ApiModelProperty(value = "是否删除 0=否 1=是")
- @TableField("isDelete")
- @TableLogic
- private Integer isDelete;
+
+ @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;
+
+ @ApiModelProperty(value = "是否管理后台添加 1=是 0=否 用于生成合同附件时过滤管理后台添加的账单，查询首个账单")
+ @TableField("is_manual_addition")
+ private Integer manualAddition;
+
+
+
+
+
+
}
--
Gitblit v1.7.1