java/xizang.git

			@@ -1,15 +1,19 @@
			package com.ruoyi.system.model;

			import com.baomidou.mybatisplus.annotation.TableName;
			import com.baomidou.mybatisplus.annotation.TableId;
			import java.time.LocalDateTime;
			import com.baomidou.mybatisplus.annotation.TableLogic;
			import cn.afterturn.easypoi.excel.annotation.Excel;
			import com.baomidou.mybatisplus.annotation.IdType;
			import com.baomidou.mybatisplus.annotation.TableField;
			import java.io.Serializable;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.baomidou.mybatisplus.annotation.TableName;
			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;
			import lombok.EqualsAndHashCode;

			import java.math.BigDecimal;
			import java.time.LocalDateTime;

			/**
			* <p>
			@@ -17,127 +21,192 @@
			* </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;

			@Excel(name = "合同编号")
			@ApiModelProperty(value = "合同编号")
			@TableField("contractNumber")
			@TableField("contract_number")
			private String contractNumber;

			@Excel(name = "合同名称")
			@ApiModelProperty(value = "合同名称")
			@TableField("contractName")
			@TableField("contract_name")
			private String contractName;

			@Excel(name = "生效日期", format = "yyyy-MM-dd HH:mm:ss")
			@TableField(exist = false)
			private String startTimeStr;
			@ApiModelProperty(value = "开始时间")
			@TableField("startTime")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			@TableField("start_time")
			private LocalDateTime startTime;

			@Excel(name = "终止日期")
			@TableField(exist = false)
			private String endTimeStr;

			@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;

			@Excel(name = "每月租金")
			@ApiModelProperty(value = "每月租金")
			@TableField("month_rent")
			private BigDecimal monthRent;
			@Excel(name = "押金")
			@ApiModelProperty(value = "押金")
			@TableField("deposit")
			private Double deposit;

			@ApiModelProperty(value = "租金支付方式 1=季付")
			@TableField("payType")
			private Integer payType;

			@ApiModelProperty(value = "第一次支付日期")
			@TableField("firstPayTime")
			private BigDecimal deposit;
			@Excel(name = "租金支付方式 1=月付 2=季付 3=年付")
			@ApiModelProperty(value = "租金支付方式月付季付年付")
			@TableField("pay_type")
			private String payType;
			@Excel(name = "开始计费日期")
			@TableField(exist = false)
			private String startPayTimeStr;
			@ApiModelProperty(value = "开始计费时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			@TableField("start_pay_time")
			private LocalDateTime startPayTime;
			@Excel(name = "合计年租金")
			@ApiModelProperty(value = "合计年租金")
			@TableField("total_year")
			private BigDecimal totalYear;
			@Excel(name = "房屋用途")
			@ApiModelProperty(value = "房屋使用范围")
			@TableField("house_use_scope")
			private String houseUseScope;
			@ApiModelProperty(value = "变动后递增或递减之后的每月租金前端忽略")
			@TableField("change_rent")
			private BigDecimal changeRent;
			@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=否")
			@TableField("isIncreasingDeposit")
			private Integer isIncreasingDeposit;

			@ApiModelProperty(value = "押金是否随租金递增递减 true=是 false=否")
			@TableField("isIncreasing_deposit")
			private Boolean isIncreasingDeposit;
			@Excel(name = "违约金比例")
			@ApiModelProperty(value = "违约金比例")
			@TableField("proportion")
			private Double proportion;

			@ApiModelProperty(value = "房屋id")
			@TableField("houseId")
			private String houseId;

			private BigDecimal proportion;
			@Excel(name = "甲方名称")
			@ApiModelProperty(value = "甲方名称")
			@TableField("partyOneName")
			@TableField("party_one_name")
			private String partyOneName;

			@Excel(name = "甲方联系人")
			@ApiModelProperty(value = "甲方联系人")
			@TableField("partyOnePerson")
			@TableField("party_one_person")
			private String partyOnePerson;

			@Excel(name = "甲方联系方式")
			@ApiModelProperty(value = "甲方联系方式")
			@TableField("partyOnePhone")
			@TableField("party_one_phone")
			private String partyOnePhone;

			@ApiModelProperty(value = "租户id")
			@TableField("tenantId")
			private String tenantId;

			@Excel(name = "乙方名称")
			@ApiModelProperty(value = "乙方名称")
			@TableField("partyTwoName")
			@TableField("party_two_name")
			private String partyTwoName;

			@Excel(name = "乙方联系人")
			@ApiModelProperty(value = "乙方联系人")
			@TableField("partyTwoPerson")
			@TableField("party_two_person")
			private String partyTwoPerson;

			@Excel(name = "乙方联系方式")
			@ApiModelProperty(value = "乙方联系方式")
			@TableField("partyTwoPhone")
			@TableField("party_two_phone")
			private String partyTwoPhone;

			@ApiModelProperty(value = "合同附件")
			@TableField("contractFile")
			@ApiModelProperty(value = "合同附件,多个逗号拼接")
			@TableField("contract_file")
			private String contractFile;

			@Excel(name = "概况补充")
			@ApiModelProperty(value = "备注")
			@TableField("remark")
			private String remark;

			@ApiModelProperty(value = "状态 1=待审批 2=未签订 3=已签订")
			/**
			* 1 待提交
			* 2 待审批
			* 3 未签订
			* 4 已签订
			* 5 已驳回
			* 6 已终止
			* 7 待结算
			* 8 已结算
			*/
			@Excel(name = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订 5=已驳回 6=已终止 7=待结算 8=已结算 9 = 签订待审核")
			@ApiModelProperty(value = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订 5=已驳回 6=已终止 7=待结算 8=已结算 9 = 签订待审核")
			@TableField("status")
			private Integer status;
			private String status;

			@ApiModelProperty(value = "创建时间")
			@TableField("createTime")
			private LocalDateTime createTime;
			/**
			* 签订时间
			*/
			@Excel(name = "签订时间")
			@TableField(exist = false)
			private String signTimeStr;
			@ApiModelProperty(value = "签订时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			@TableField("sign_time")
			private LocalDateTime signTime;

			@ApiModelProperty(value = "修改时间")
			@TableField("updateTime")
			private LocalDateTime updateTime;
			@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(exist = false)
			private String houseName;
			@ApiModelProperty(value = "租户名称")
			@TableField(exist = false)
			private String tenantName;
			@ApiModelProperty(value = "房屋地址")
			@TableField(exist = false)
			private String houseAddress;
			@ApiModelProperty(value = "审批流实例id")
			@TableField(exist = false)
			private String instanceId;

			@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("terminate_time")
			private LocalDateTime terminateTime;
			@Excel(name = "房屋id")
			@ApiModelProperty(value = "房屋id")
			@TableField("house_id")
			private String houseId;
			@Excel(name = "租户id")
			@ApiModelProperty(value = "租户id")
			@TableField("tenant_id")
			private String tenantId;
			@Excel(name = "所属营业部id")
			@ApiModelProperty(value = "营业部id")
			@TableField("business_dept_id")
			private String businessDeptId;

			}