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 | 72 ++++++++++++++++++++++++++++--------
1 files changed, 56 insertions(+), 16 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 42b77b4..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,26 +1,23 @@
package com.ruoyi.system.model;
+import com.baomidou.mybatisplus.annotation.FieldFill;
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.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.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseModel;
-import com.ruoyi.common.core.domain.BasePage;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.springframework.data.annotation.Transient;
-import springfox.documentation.annotations.ApiIgnore;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -34,16 +31,53 @@
@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;
@ApiModelProperty(value = "合同id")
@TableField("contract_id")
private String contractId;
+
+ @ApiModelProperty(value = "营运部门ID")
+ @TableField("business_dept_id")
+ private String businessDeptId;
@ApiModelProperty(value = "合同编号")
@TableField("contract_number")
@@ -67,7 +101,7 @@
private BigDecimal payFeesMoney;
@ApiModelProperty(value = "缴费日期")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("pay_fees_time")
private LocalDateTime payFeesTime;
@@ -149,6 +183,12 @@
@TableField(exist = false)
private BigDecimal preOutstand;
+ @ApiModelProperty(value = "是否管理后台添加 1=是 0=否 用于生成合同附件时过滤管理后台添加的账单，查询首个账单")
+ @TableField("is_manual_addition")
+ private Integer manualAddition;
+
+
+
--
Gitblit v1.7.1