From 82ea85d8714462e23e598f4563c758ebf2b764ca Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 20 二月 2025 18:08:47 +0800
Subject: [PATCH] 合同新增审批
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 3ca556f..63dec62 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
@@ -44,12 +44,12 @@
private String contractName;
@ApiModelProperty(value = "开始时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("start_time")
private LocalDateTime startTime;
@ApiModelProperty(value = "结束时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("end_time")
private LocalDateTime endTime;
@ApiModelProperty(value = "开始计费时间")
@@ -87,7 +87,7 @@
@ApiModelProperty(value = "押金是否随租金递增递减 true=是 false=否")
@TableField("isIncreasing_deposit")
- private Boolean isincreasingDeposit;
+ private Boolean isIncreasingDeposit;
@ApiModelProperty(value = "违约金比例")
@TableField("proportion")
@@ -133,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 = "内存大小多个文件逗号拼接")
@@ -151,5 +161,11 @@
@ApiModelProperty(value = "合计年租金")
@TableField("total_year")
private BigDecimal totalYear;
+ @ApiModelProperty(value = "房屋名称")
+ @TableField(exist = false)
+ private String houseName;
+ @ApiModelProperty(value = "房屋地址")
+ @TableField(exist = false)
+ private String houseAddress;
}
--
Gitblit v1.7.1