From e381ed97c186843adcd4accac0f2bf2206d5ea1e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 18 二月 2025 11:28:55 +0800
Subject: [PATCH] 合同
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
index 635c6cb..396fe85 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
@@ -52,6 +52,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("end_time")
private LocalDateTime endTime;
+ @ApiModelProperty(value = "开始计费时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("start_pay_time")
+ private LocalDateTime startPayTime;
@ApiModelProperty(value = "每月租金")
@TableField("month_rent")
@@ -60,15 +64,22 @@
@ApiModelProperty(value = "押金")
@TableField("deposit")
private BigDecimal deposit;
+ @ApiModelProperty(value = "变动后递增或递减之后的每月租金 前端忽略")
+ @TableField("change_rent")
+ private BigDecimal changeRent;
@ApiModelProperty(value = "租金支付方式 月付 季付 年付")
@TableField("pay_type")
private String payType;
- @ApiModelProperty(value = "第一次支付日期")
+ @ApiModelProperty(value = "账单第一次支付日期 合同生效日期+10天 （不是真正的支付日期）生成第一次帐单后存值")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("first_pay_time")
private LocalDateTime firstPayTime;
+ @ApiModelProperty(value = "变动时间 根据周期改变 前端忽略")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("change_time")
+ private LocalDateTime changeTime;
@ApiModelProperty(value = "是否递增递减 true=是 false=否")
@TableField("isIncreasing")
@@ -76,7 +87,7 @@
@ApiModelProperty(value = "押金是否随租金递增递减 true=是 false=否")
@TableField("isIncreasing_deposit")
- private Boolean isincreasingDeposit;
+ private Boolean isIncreasingDeposit;
@ApiModelProperty(value = "违约金比例")
@TableField("proportion")
@@ -122,7 +133,17 @@
@TableField("remark")
private String remark;
- @ApiModelProperty(value = "状态 待提交 待审批 未签订 已签订....")
+ /**
+ * 1 待提交
+ * 2 待审批
+ * 3 未签订
+ * 4 已签订
+ * 5 已驳回
+ * 6 已终止
+ * 7 待结算
+ * 8 已结算
+ */
+ @ApiModelProperty(value = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订 5=已驳回 6=已终止 7=待结算 8=已结算")
@TableField("status")
private String status;
@ApiModelProperty(value = "内存大小多个文件逗号拼接")
@@ -140,5 +161,8 @@
@ApiModelProperty(value = "合计年租金")
@TableField("total_year")
private BigDecimal totalYear;
+ @ApiModelProperty(value = "房屋名称")
+ @TableField(exist = false)
+ private String houseName;
}
--
Gitblit v1.7.1