From ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:30:18 +0800
Subject: [PATCH] 公安安全监管
---
src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
index f03796e..6cb6b92 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
@@ -16,10 +16,7 @@
*/
package org.springblade.modules.property.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -84,7 +81,7 @@
* 分摊方式
*/
@ApiModelProperty(value = "分摊方式")
- private Integer allocationWay;
+ private String allocationWay;
/**
* 预算总金额
*/
@@ -109,11 +106,15 @@
* 预计开工时间
*/
@ApiModelProperty(value = "预计开工时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date runTime;
/**
* 预计竣工时间
*/
@ApiModelProperty(value = "预计竣工时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date completedTime;
/**
* 项目摘要
@@ -136,6 +137,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("创建人")
+ @TableField(fill = FieldFill.INSERT)
private String createUser;
/**
@@ -143,6 +145,7 @@
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT)
@ApiModelProperty("创建时间")
private Date createTime;
@@ -151,6 +154,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("更新人")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateUser;
/**
@@ -158,6 +162,7 @@
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
@ApiModelProperty("更新时间")
private Date updateTime;
@@ -168,4 +173,37 @@
@ApiModelProperty("是否已删除 0:否 1:是")
private Integer isDeleted;
+ /**
+ * 流程定义id
+ */
+ @ApiModelProperty("流程定义id")
+ private String processDefinitionId;
+
+ /**
+ * 流程实例id
+ */
+ @ApiModelProperty("流程实例id")
+ private String processInstanceId;
+
+
+ /**
+ * 流程定义ke
+ */
+ @ApiModelProperty("流程定义ke")
+ private String processDefinitionKey;
+
+ /**
+ * 流程申请时间
+ */
+ @ApiModelProperty("流程申请时间")
+ private Date applyTime;
+
+ /**
+ * 申请状态
+ */
+ @ApiModelProperty("申请状态 0：待审核 1：业委会审核 2：街道审核 3：住建局审核 4：调整申请 5：审核通过 6：审核不通过")
+ private Integer applyStatus;
+
+ private String taskId;
+
}
--
Gitblit v1.9.3