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 | 72 ++++++++++++++++++++++++++++-------
1 files changed, 57 insertions(+), 15 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 6dc8972..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,39 +44,50 @@
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 = "开始计费时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("start_pay_time")
+ private LocalDateTime startPayTime;
- @ApiModelProperty(value = "合计租金")
- @TableField("total_rent")
- private BigDecimal totalRent;
+ @ApiModelProperty(value = "每月租金")
+ @TableField("month_rent")
+ private BigDecimal monthRent;
@ApiModelProperty(value = "押金")
@TableField("deposit")
private BigDecimal deposit;
+ @ApiModelProperty(value = "变动后递增或递减之后的每月租金 前端忽略")
+ @TableField("change_rent")
+ private BigDecimal changeRent;
- @ApiModelProperty(value = "租金支付方式 1=季付")
+ @ApiModelProperty(value = "租金支付方式 月付 季付 年付")
@TableField("pay_type")
- private Integer payType;
+ 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 = "是否递增递减 1=是 0=否")
+ @ApiModelProperty(value = "是否递增递减 true=是 false=否")
@TableField("isIncreasing")
- private Integer isIncreasing;
+ private Boolean isIncreasing;
- @ApiModelProperty(value = "押金是否随租金递增递减 1=是 0=否")
+ @ApiModelProperty(value = "押金是否随租金递增递减 true=是 false=否")
@TableField("isIncreasing_deposit")
- private Integer isincreasingDeposit;
+ private Boolean isIncreasingDeposit;
@ApiModelProperty(value = "违约金比例")
@TableField("proportion")
@@ -114,7 +125,7 @@
@TableField("party_two_phone")
private String partyTwoPhone;
- @ApiModelProperty(value = "合同附件")
+ @ApiModelProperty(value = "合同附件,多个逗号拼接")
@TableField("contract_file")
private String contractFile;
@@ -122,8 +133,39 @@
@TableField("remark")
private String remark;
- @ApiModelProperty(value = "状态 1=待审批 2=未签订 3=已签订")
+ /**
+ * 1 待提交
+ * 2 待审批
+ * 3 未签订
+ * 4 已签订
+ * 5 已驳回
+ * 6 已终止
+ * 7 待结算
+ * 8 已结算
+ */
+ @ApiModelProperty(value = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订 5=已驳回 6=已终止 7=待结算 8=已结算")
@TableField("status")
- private Integer status;
+ private String status;
+ @ApiModelProperty(value = "内存大小多个文件逗号拼接")
+ @TableField("memory")
+ private String memory;
+ @ApiModelProperty(value = "附件名称 逗号拼接")
+ @TableField("contract_file_name")
+ private String contractFileName;
+ @ApiModelProperty(value = "租户确认合同电子签名")
+ @TableField("signature")
+ private String signature;
+ @ApiModelProperty(value = "终止合同备注说明")
+ @TableField("terminate_remark")
+ private String terminateRemark;
+ @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