java/xizang.git

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

			import cn.afterturn.easypoi.excel.annotation.Excel;
			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.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>
			@@ -34,44 +33,62 @@

			@TableId(value = "id", type = IdType.ASSIGN_ID)
			private String id;

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

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

			@Excel(name = "生效日期", format = "yyyy-MM-dd HH:mm:ss")
			@TableField(exist = false)
			private String startTimeStr;
			@ApiModelProperty(value = "开始时间")
			@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 = "结束时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			@TableField("end_time")
			private LocalDateTime endTime;
			@Excel(name = "每月租金")
			@ApiModelProperty(value = "每月租金")
			@TableField("month_rent")
			private BigDecimal monthRent;
			@Excel(name = "押金")
			@ApiModelProperty(value = "押金")
			@TableField("deposit")
			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;

			@ApiModelProperty(value = "每月租金")
			@TableField("month_rent")
			private BigDecimal monthRent;

			@ApiModelProperty(value = "押金")
			@TableField("deposit")
			private BigDecimal deposit;
			@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 = "租金支付方式月付季付年付")
			@TableField("pay_type")
			private String payType;

			@ApiModelProperty(value = "账单第一次支付日期合同生效日期+10天（不是真正的支付日期）生成第一次帐单后存值")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			@TableField("first_pay_time")
			@@ -88,39 +105,31 @@
			@ApiModelProperty(value = "押金是否随租金递增递减 true=是 false=否")
			@TableField("isIncreasing_deposit")
			private Boolean isIncreasingDeposit;

			@Excel(name = "违约金比例")
			@ApiModelProperty(value = "违约金比例")
			@TableField("proportion")
			private BigDecimal proportion;

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

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

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

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

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

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

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

			@Excel(name = "乙方联系方式")
			@ApiModelProperty(value = "乙方联系方式")
			@TableField("party_two_phone")
			private String partyTwoPhone;
			@@ -128,7 +137,7 @@
			@ApiModelProperty(value = "合同附件,多个逗号拼接")
			@TableField("contract_file")
			private String contractFile;

			@Excel(name = "概况补充")
			@ApiModelProperty(value = "备注")
			@TableField("remark")
			private String remark;
			@@ -143,9 +152,22 @@
			* 7 待结算
			* 8 已结算
			*/
			@ApiModelProperty(value = "合同状态 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 String status;

			/**
			* 签订时间
			*/
			@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("memory")
			private String memory;
			@@ -158,17 +180,33 @@
			@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 tenantName;
			@ApiModelProperty(value = "房屋地址")
			@TableField(exist = false)
			private String houseAddress;
			@ApiModelProperty(value = "审批流实例id")
			@TableField(exist = false)
			private Long instanceId;
			private String instanceId;

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

			}