From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessTaskListVO.java | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 114 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessTaskListVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessTaskListVO.java
index 8b4fee1..097518b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessTaskListVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessTaskListVO.java
@@ -1,17 +1,25 @@
package com.ruoyi.system.vo;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.system.model.TContract;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.Date;
@Data
public class ProcessTaskListVO {
private String nodeName;
+ private String id;
private String flowId;
@@ -28,6 +36,7 @@
private Date createTime;
private String status;
+ private Integer taskState;
private String taskId;
@@ -39,4 +48,109 @@
private String variable;
private String reason;
+
+ @ApiModelProperty(value = "合同信息")
+ private TContract contract;
+
+ @ApiModelProperty(value = "合同id")
+ private String contractId;
+
+ @ApiModelProperty(value = "合同编号")
+ private String contractNumber;
+
+ @ApiModelProperty(value = "合同名称")
+ private String contractName;
+
+ @ApiModelProperty(value = "开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime startTime;
+
+ @ApiModelProperty(value = "结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime endTime;
+ @ApiModelProperty(value = "开始计费时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime startPayTime;
+
+ @ApiModelProperty(value = "每月租金")
+ private BigDecimal monthRent;
+
+ @ApiModelProperty(value = "押金")
+ private BigDecimal deposit;
+ @ApiModelProperty(value = "变动后递增或递减之后的每月租金 前端忽略")
+ private BigDecimal changeRent;
+
+ @ApiModelProperty(value = "租金支付方式 月付 季付 年付")
+ private String payType;
+
+ @ApiModelProperty(value = "账单第一次支付日期 合同生效日期+10天 （不是真正的支付日期）生成第一次帐单后存值")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime firstPayTime;
+ @ApiModelProperty(value = "变动时间 根据周期改变 前端忽略")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime changeTime;
+
+ @ApiModelProperty(value = "是否递增递减 true=是 false=否")
+ private Boolean isIncreasing;
+
+ @ApiModelProperty(value = "押金是否随租金递增递减 true=是 false=否")
+ private Boolean isIncreasingDeposit;
+
+ @ApiModelProperty(value = "违约金比例")
+ private BigDecimal proportion;
+
+ @ApiModelProperty(value = "房屋id")
+ private String houseId;
+
+ @ApiModelProperty(value = "甲方名称")
+ private String partyOneName;
+
+ @ApiModelProperty(value = "甲方联系人")
+ private String partyOnePerson;
+
+ @ApiModelProperty(value = "甲方联系方式")
+ private String partyOnePhone;
+
+ @ApiModelProperty(value = "租户id")
+ private String tenantId;
+
+ @ApiModelProperty(value = "乙方名称")
+ private String partyTwoName;
+
+ @ApiModelProperty(value = "乙方联系人")
+ private String partyTwoPerson;
+
+ @ApiModelProperty(value = "乙方联系方式")
+ private String partyTwoPhone;
+
+ @ApiModelProperty(value = "合同附件,多个逗号拼接")
+ private String contractFile;
+
+ /**
+ * 1 待提交
+ * 2 待审批
+ * 3 未签订
+ * 4 已签订
+ * 5 已驳回
+ * 6 已终止
+ * 7 待结算
+ * 8 已结算
+ */
+ @ApiModelProperty(value = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订 5=已驳回 6=已终止 7=待结算 8=已结算")
+ private String contractStatus;
+ @ApiModelProperty(value = "内存大小多个文件逗号拼接")
+ private String memory;
+ @ApiModelProperty(value = "附件名称 逗号拼接")
+ private String contractFileName;
+ @ApiModelProperty(value = "租户确认合同电子签名")
+ private String signature;
+ @ApiModelProperty(value = "终止合同备注说明")
+ private String terminateRemark;
+ @ApiModelProperty(value = "合计年租金")
+ private BigDecimal totalYear;
+
+ @ApiModelProperty(value = "合同时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime contractTime;
+
}
--
Gitblit v1.7.1