From c184fa19557e117c81b83c9916c8d012e5a778d4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 22 一月 2025 08:59:34 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java | 75 ++++++++++++++++---------------------
1 files changed, 32 insertions(+), 43 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..7abdadb 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,11 +1,17 @@
package com.ruoyi.system.model;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.math.BigDecimal;
import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseModel;
+import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,99 +23,82 @@
* </p>
*
* @author xiaochen
- * @since 2025-01-17
+ * @since 2025-01-20
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_bill")
@ApiModel(value="TBill对象", description="租金账单")
-public class TBill implements Serializable {
+public class TBill extends BaseModel {
private static final long serialVersionUID = 1L;
- @TableId("id")
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
@ApiModelProperty(value = "合同id")
- @TableField("contractId")
+ @TableField("contract_id")
private String contractId;
@ApiModelProperty(value = "应缴费")
- @TableField("payableFeesMoney")
- private Double payableFeesMoney;
+ @TableField("payable_fees_money")
+ private BigDecimal payableFeesMoney;
@ApiModelProperty(value = "应缴费日期")
- @TableField("payableFeesTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("payable_fees_time")
private LocalDateTime payableFeesTime;
@ApiModelProperty(value = "缴费状态 1=未缴费 2=待确认 3=已缴费 4=已逾期")
- @TableField("payFeesStatus")
+ @TableField("pay_fees_status")
private Integer 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")
+ @TableField("bill_type")
private Integer 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;
+ @TableField("actual_money")
+ private BigDecimal actualMoney;
@ApiModelProperty(value = "凭证上传")
@TableField("voucher")
private String voucher;
-
- @ApiModelProperty(value = "创建时间")
- @TableField("createTime")
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "修改时间")
- @TableField("updateTime")
- private LocalDateTime updateTime;
-
- @ApiModelProperty(value = "创建人")
- @TableField("createBy")
- private String createBy;
-
- @ApiModelProperty(value = "修改人")
- @TableField("updateBy")
- private String updateBy;
-
- @ApiModelProperty(value = "是否删除 0=否 1=是")
- @TableField("isDelete")
- @TableLogic
- private Integer isDelete;
}
--
Gitblit v1.7.1