From f9a3f18dc49f4d1317b8cb4f04d53d268bd90bbf Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 09 Nov 2023 17:46:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
index a8b3b15..91d4875 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
@@ -17,6 +17,9 @@
package org.springblade.modules.task.entity;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -24,6 +27,8 @@
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+import sun.rmi.runtime.Log;
/**
* 报事报修任务表 实体类
@@ -38,10 +43,23 @@
public class TaskReportForRepairsEntity extends BaseEntity {
/**
- * 类型 1公共维修，2居家维修，3矛盾纠纷，4投诉举报
+ * 类型 1公共维修，2居家维修，3矛盾纠纷，4投诉举报,5企业商户上报
*/
- @ApiModelProperty(value = "类型 1公共维修，2居家维修，3矛盾纠纷，4投诉举报")
+ @ApiModelProperty(value = "类型 1公共维修，2居家维修，3矛盾纠纷，4投诉举报,5企业商户上报")
private Integer type;
+
+ /**
+ * 任务id
+ */
+ @ApiModelProperty(value = "任务id")
+ private Long taskId;
+
+ /**
+ * 门牌地址编码
+ */
+ @ApiModelProperty(value = "门牌地址编码")
+ private String addressCode;
+
/**
* 姓名
*/
@@ -62,4 +80,28 @@
*/
@ApiModelProperty(value = "图片路径")
private String imageUrls;
+
+ /**
+ * 确认用户ID
+ */
+ @ApiModelProperty(value = "确认用户ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long confirmUserId;
+ /**
+ * 确认时间
+ */
+ @ApiModelProperty(value = "确认时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date confirmTime;
+ /**
+ * 确认标记 1：待处理 2：处理中 3：已处理
+ */
+ @ApiModelProperty(value = "确认标记 1：待处理 2：处理中 3：已处理")
+ private Integer confirmFlag;
+ /**
+ * 确认意见
+ */
+ @ApiModelProperty(value = "确认意见")
+ private String confirmNotion;
}
--
Gitblit v1.9.3