From c885f99c9ff1445f6975d16faf4a23006cd5763b Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 05 二月 2025 14:53:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java | 92 +++++++++++++++++++++-------------------------
1 files changed, 42 insertions(+), 50 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 d17810a..bc259e8 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
@@ -1,11 +1,16 @@
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,49 +22,52 @@
* </p>
*
* @author xiaochen
- * @since 2025-01-17
+ * @since 2025-01-20
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_contract")
@ApiModel(value="TContract对象", description="合同管理")
-public class TContract implements Serializable {
+public class TContract extends BaseModel {
private static final long serialVersionUID = 1L;
- @TableId("id")
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
@ApiModelProperty(value = "合同编号")
- @TableField("contractNumber")
+ @TableField("contract_number")
private String contractNumber;
@ApiModelProperty(value = "合同名称")
- @TableField("contractName")
+ @TableField("contract_name")
private String contractName;
@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("totalRent")
- private Double totalRent;
+ @TableField("total_rent")
+ private BigDecimal totalRent;
@ApiModelProperty(value = "押金")
@TableField("deposit")
- private Double deposit;
+ private BigDecimal deposit;
- @ApiModelProperty(value = "租金支付方式 1=季付")
- @TableField("payType")
+ @ApiModelProperty(value = "租金支付方式 1=月付 2=季付 3=年付")
+ @TableField("pay_type")
private Integer payType;
@ApiModelProperty(value = "第一次支付日期")
- @TableField("firstPayTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("first_pay_time")
private LocalDateTime firstPayTime;
@ApiModelProperty(value = "是否递增递减 1=是 0=否")
@@ -67,77 +75,61 @@
private Integer isIncreasing;
@ApiModelProperty(value = "押金是否随租金递增递减 1=是 0=否")
- @TableField("isIncreasingDeposit")
- private Integer isIncreasingDeposit;
+ @TableField("isIncreasing_deposit")
+ private Integer isincreasingDeposit;
@ApiModelProperty(value = "违约金比例")
@TableField("proportion")
- private Double proportion;
+ private BigDecimal proportion;
@ApiModelProperty(value = "房屋id")
- @TableField("houseId")
+ @TableField("house_id")
private String houseId;
@ApiModelProperty(value = "甲方名称")
- @TableField("partyOneName")
+ @TableField("party_one_name")
private String partyOneName;
@ApiModelProperty(value = "甲方联系人")
- @TableField("partyOnePerson")
+ @TableField("party_one_person")
private String partyOnePerson;
@ApiModelProperty(value = "甲方联系方式")
- @TableField("partyOnePhone")
+ @TableField("party_one_phone")
private String partyOnePhone;
@ApiModelProperty(value = "租户id")
- @TableField("tenantId")
+ @TableField("tenant_id")
private String tenantId;
@ApiModelProperty(value = "乙方名称")
- @TableField("partyTwoName")
+ @TableField("party_two_name")
private String partyTwoName;
@ApiModelProperty(value = "乙方联系人")
- @TableField("partyTwoPerson")
+ @TableField("party_two_person")
private String partyTwoPerson;
@ApiModelProperty(value = "乙方联系方式")
- @TableField("partyTwoPhone")
+ @TableField("party_two_phone")
private String partyTwoPhone;
- @ApiModelProperty(value = "合同附件")
- @TableField("contractFile")
+ @ApiModelProperty(value = "合同附件,多个逗号拼接")
+ @TableField("contract_file")
private String contractFile;
@ApiModelProperty(value = "备注")
@TableField("remark")
private String remark;
- @ApiModelProperty(value = "状态 1=待审批 2=未签订 3=已签订")
+ @ApiModelProperty(value = "状态 1=待提交 2=待审批 3=未签订 4=已签订")
@TableField("status")
private Integer status;
-
- @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;
-
+ @ApiModelProperty(value = "内存大小多个文件逗号拼接")
+ @TableField("memory")
+ private String memory;
+ @ApiModelProperty(value = "附件名称 逗号拼接")
+ @TableField("contract_file_name")
+ private String contractFileName;
}
--
Gitblit v1.7.1