From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送

---
 src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java |  135 ++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 126 insertions(+), 9 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 d1cd38c..0618674 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
@@ -16,15 +16,18 @@
  */
 package org.springblade.modules.property.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
+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;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-
-import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
 
 /**
  * 物业维修资金申请表 实体类
@@ -35,9 +38,16 @@
 @Data
 @TableName("jczz_property_capital_apply")
 @ApiModel(value = "PropertyCapitalApply对象", description = "物业维修资金申请表")
-@EqualsAndHashCode(callSuper = true)
-public class PropertyCapitalApplyEntity extends TenantEntity {
+public class PropertyCapitalApplyEntity implements Serializable {
 
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 主键
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty("主键id")
+	@TableId(value = "id", type = IdType.AUTO)
+	private Integer id;
 	/**
 	 * 物业公司id
 	 */
@@ -66,8 +76,8 @@
 	/**
 	 * 分摊方式
 	 */
-	@ApiModelProperty(value = "分摊方式")
-	private Integer allocationWay;
+	@ApiModelProperty(value = "分摊方式:按照面积分摊")
+	private String allocationWay;
 	/**
 	 * 预算总金额
 	 */
@@ -92,11 +102,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;
 	/**
 	 * 项目摘要
@@ -114,4 +128,107 @@
 	@ApiModelProperty(value = "施工方案附件urls")
 	private String constructionSchemeUrls;
 
+	/**
+	 * 创建人
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty("创建人")
+	@TableField(fill = FieldFill.INSERT)
+	private String createUser;
+
+	/**
+	 * 创建时间
+	 */
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@TableField(fill = FieldFill.INSERT)
+	@ApiModelProperty("创建时间")
+	private Date createTime;
+
+	/**
+	 * 更新人
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty("更新人")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	private String updateUser;
+
+	/**
+	 * 更新时间
+	 */
+	@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;
+
+	/**
+	 * 是否删除
+	 */
+	@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:审核不通过 7:上饶住建局")
+	private Integer applyStatus;
+
+	@ApiModelProperty("任务id")
+	private String taskId;
+	@ApiModelProperty("文章id")
+	private Integer articleId;
+
+	@ApiModelProperty(value = "附件 [{fileName:'',fileType:'zip',fileUrl:'https://www.****.com'}]")
+	private String attachment;
+
+	/**
+	 * 楼栋编码
+	 */
+	@ApiModelProperty(value = "楼栋编码")
+	private String buildingCode;
+	/**
+	 * 楼栋号(名称)
+	 */
+	@ApiModelProperty(value = "楼栋号(名称)")
+	private String buildingName;
+
+	/**
+	 * 户室号集合
+	 */
+	@ApiModelProperty(value = "户室号集合")
+	private String houseNames;
+
+	/**
+	 * 地址编码集合
+	 */
+	@ApiModelProperty(value = "地址编码集合")
+	private String addressCodes;
+
 }

--
Gitblit v1.9.3