From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java | 202 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 147 insertions(+), 55 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 bfb6e32..6cb6b92 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
@@ -45,73 +45,165 @@
public class PropertyCapitalApplyEntity implements Serializable {
private static final long serialVersionUID = 1L;
-
-
- /** 主键 */
- @ApiModelProperty(value = "主键ID", example = "")
+ /**
+ * 主键
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("主键id")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
-
- /** 物业公司名称 */
- @ApiModelProperty(value = "物业公司名称", example = "")
- @TableField("name")
+ /**
+ * 物业公司id
+ */
+ @ApiModelProperty(value = "物业公司id")
+ private Integer propertyCompanyId;
+ /**
+ * 小区id
+ */
+ @ApiModelProperty(value = "小区id")
+ private String districtId;
+ /**
+ * 资金申请项目名称
+ */
+ @ApiModelProperty(value = "资金申请项目名称")
private String name;
+ /**
+ * 联系人姓名
+ */
+ @ApiModelProperty(value = "联系人姓名")
+ private String linkman;
+ /**
+ * 联系人电话
+ */
+ @ApiModelProperty(value = "联系人电话")
+ private String linkPhone;
+ /**
+ * 分摊方式
+ */
+ @ApiModelProperty(value = "分摊方式")
+ private String allocationWay;
+ /**
+ * 预算总金额
+ */
+ @ApiModelProperty(value = "预算总金额")
+ private BigDecimal budgetAmount;
+ /**
+ * 实际总金额
+ */
+ @ApiModelProperty(value = "实际总金额")
+ private BigDecimal actualAmount;
+ /**
+ * 自筹金额
+ */
+ @ApiModelProperty(value = "自筹金额")
+ private BigDecimal selfAmount;
+ /**
+ * 预算应拨付金额
+ */
+ @ApiModelProperty(value = "预算应拨付金额")
+ private BigDecimal budgetAppropriateAmount;
+ /**
+ * 预计开工时间
+ */
+ @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;
+ /**
+ * 项目摘要
+ */
+ @ApiModelProperty(value = "项目摘要")
+ private String projectDigest;
+ /**
+ * 项目描述
+ */
+ @ApiModelProperty(value = "项目描述")
+ private String projectDescribe;
+ /**
+ * 施工方案附件urls
+ */
+ @ApiModelProperty(value = "施工方案附件urls")
+ private String constructionSchemeUrls;
- /** 地址 */
- @ApiModelProperty(value = "地址", example = "")
- @TableField("address")
- private String address;
-
- /** 社会信用代码 */
- @ApiModelProperty(value = "社会信用代码", example = "")
- @TableField("social_credit_code")
- private String socialCreditCode;
-
- /** 省编号 */
- @ApiModelProperty(value = "省编号", example = "")
- @TableField("province_code")
- private String provinceCode;
-
- /** 市编号 */
- @ApiModelProperty(value = "市编号", example = "")
- @TableField("city_code")
- private String cityCode;
-
- /** 区县编号 */
- @ApiModelProperty(value = "区县编号", example = "")
- @TableField("county_code")
- private String countyCode;
-
- /** 简介 */
- @ApiModelProperty(value = "简介", example = "")
- @TableField("remark")
- private String remark;
-
- /** 创建人 */
- @ApiModelProperty(value = "创建人", example = "")
- @TableField("create_user")
+ /**
+ * 创建人
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("创建人")
+ @TableField(fill = FieldFill.INSERT)
private String createUser;
- /** 创建时间 */
- @ApiModelProperty(value = "创建时间", example = "")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @TableField("create_time")
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty("创建时间")
private Date createTime;
- /** 更新人 */
- @ApiModelProperty(value = "更新人", example = "")
- @TableField("update_user")
+ /**
+ * 更新人
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("更新人")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateUser;
- /** 更新时间 */
- @ApiModelProperty(value = "更新时间", example = "")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @TableField("update_time")
+ /**
+ * 更新时间
+ */
+ @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;
- /** 是否删除 0：否 1：是 */
- @ApiModelProperty(value = "是否删除 0：否 1：是", example = "")
- @TableField("is_deleted")
+ /**
+ * 是否删除
+ */
+ @TableLogic
+ @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