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/TaskHotelReportingEntity.java | 99 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 72 insertions(+), 27 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/entity/TaskHotelReportingEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskHotelReportingEntity.java
index e3a83c8..5fb45d2 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskHotelReportingEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskHotelReportingEntity.java
@@ -16,13 +16,15 @@
*/
package org.springblade.modules.task.entity;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-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;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
import java.util.Date;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
@@ -37,8 +39,17 @@
@Data
@TableName("jczz_task_hotel_reporting")
@ApiModel(value = "TaskHotelReporting对象", description = "旅馆安全自查任务")
-@EqualsAndHashCode(callSuper = true)
-public class TaskHotelReportingEntity extends TenantEntity {
+public class TaskHotelReportingEntity implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("主键id")
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Long id;
/**
* 任务id
@@ -55,16 +66,16 @@
*/
@ApiModelProperty(value = "场所ID")
private Long placeId;
- /**
- * 小区ID
- */
- @ApiModelProperty(value = "小区ID")
- private String districtId;
- /**
- * 小区名称
- */
- @ApiModelProperty(value = "小区名称")
- private String districtName;
+// /**
+// * 小区ID
+// */
+// @ApiModelProperty(value = "小区ID")
+// private String districtId;
+// /**
+// * 小区名称
+// */
+// @ApiModelProperty(value = "小区名称")
+// private String districtName;
/**
* 自查时间
*/
@@ -148,6 +159,11 @@
@ApiModelProperty(value = "是否完全实名制登记")
private String realName;
/**
+ * 安全通道有无
+ */
+ @ApiModelProperty(value = "安全通道有无")
+ private String scFlag;
+ /**
* 确认时间
*/
@ApiModelProperty(value = "确认时间")
@@ -160,36 +176,65 @@
@ApiModelProperty(value = "确认用户ID")
private Long confirmUserId;
/**
- * 确认用户ID
+ * 确认用户姓名
*/
- @ApiModelProperty(value = "确认用户ID")
+ @ApiModelProperty(value = "确认用户姓名")
private String confirmUserName;
- /**
- * 安全通道有无
- */
- @ApiModelProperty(value = "安全通道有无")
- private String scFlag;
/**
* 确认意见
*/
@ApiModelProperty(value = "确认意见")
private String confirmNotion;
- /**
- * 确认标记
- */
- @ApiModelProperty(value = "确认标记")
- private String confirmFlag;
+ /**
+ * 确认标记 1：待审核 2：审核通过 3：审核不通过 4:待上报（场所负责人完善，由系统下发的任务）
+ */
+ @ApiModelProperty(value = "确认标记 1：待审核 2：审核通过 3：审核不通过 4:待上报（场所负责人完善，由系统下发的任务）")
+ private String confirmFlag;
+ /**
+ * 来源： 1：主动上报 2：系统自动下发
+ */
+ @ApiModelProperty(value = "来源： 1：主动上报 2：系统自动下发")
+ private Integer source;
+
+ /**
+ * 创建时间
+ */
@TableField(fill = FieldFill.INSERT)
@ApiModelProperty(value = "创建时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
+ /**
+ * 创建人
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("创建人")
+ @TableField(fill = FieldFill.INSERT)
+ private String createUser;
+
+ /**
+ * 更新人
+ */
+ @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：是
+ */
+ @ApiModelProperty("是否已删除")
+ private Integer isDeleted;
+
}
--
Gitblit v1.9.3