From af21084fa4d1e5f8432f61fbd26a3e4e99495616 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 11 Jan 2024 18:03:49 +0800
Subject: [PATCH] 三色任务完善
---
src/main/java/org/springblade/modules/task/entity/TaskCampusReportingEventEntity.java | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/entity/TaskCampusReportingEventEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskCampusReportingEventEntity.java
index 93a41a9..a978680 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskCampusReportingEventEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskCampusReportingEventEntity.java
@@ -41,7 +41,7 @@
/** 主键id */
@ApiModelProperty(value = "主键ID", example = "")
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
/** 任务ID */
@ApiModelProperty(value = "任务ID", example = "")
@@ -53,15 +53,15 @@
@TableField("place_id")
private Long placeId;
- /** 小区ID */
- @ApiModelProperty(value = "小区ID", example = "")
- @TableField("district_id")
- private String districtId;
-
- /** 小区名称 */
- @ApiModelProperty(value = "小区名称", example = "")
- @TableField("district_name")
- private String districtName;
+// /** 小区ID */
+// @ApiModelProperty(value = "小区ID", example = "")
+// @TableField("district_id")
+// private String districtId;
+//
+// /** 小区名称 */
+// @ApiModelProperty(value = "小区名称", example = "")
+// @TableField("district_name")
+// private String districtName;
/** 自查时间 */
@ApiModelProperty(value = "自查时间", example = "")
@@ -125,8 +125,10 @@
@TableField("confirm_notion")
private String confirmNotion;
- /** 确认标记 */
- @ApiModelProperty(value = "确认标记", example = "")
+ /**
+ * 确认标记 1：待审核 2：审核通过 3：审核不通过 4:待上报（场所负责人完善，由系统下发的任务）
+ */
+ @ApiModelProperty(value = "确认标记 1：待审核 2：审核通过 3：审核不通过 4:待上报（场所负责人完善，由系统下发的任务）", example = "")
@TableField("confirm_flag")
private String confirmFlag;
@@ -215,6 +217,12 @@
private String foImageUrls;
/**
+ * 来源： 1：主动上报 2：系统自动下发
+ */
+ @ApiModelProperty(value = "来源： 1：主动上报 2：系统自动下发")
+ private Integer source;
+
+ /**
* 创建时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -232,10 +240,21 @@
private Long createUser;
/**
- * 来源： 1：主动上报 2：系统自动下发
+ * 更新人
*/
- @ApiModelProperty(value = "来源： 1：主动上报 2：系统自动下发")
- private Integer source;
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("更新人")
+ @TableField(fill = FieldFill.UPDATE)
+ private String updateUser;
+
+ /**
+ * 更新时间
+ */
+ @TableField(fill = FieldFill.UPDATE)
+ @ApiModelProperty(value = "更新时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
/**
* 是否已删除 0:否 1：是
--
Gitblit v1.9.3