From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计

---
 src/main/java/org/springblade/modules/task/entity/TaskCampusReportingEventEntity.java |  102 +++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 78 insertions(+), 24 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 2ef97d2..4ab84be 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskCampusReportingEventEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskCampusReportingEventEntity.java
@@ -16,17 +16,17 @@
  */
 package org.springblade.modules.task.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+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.util.Date;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
 
 /**
  * 校园安全检查任务表 实体类
@@ -37,12 +37,14 @@
 @Data
 @TableName("jczz_task_campus_reporting_event")
 @ApiModel(value = "TaskCampusReportingEvent对象", description = "校园安全检查任务表")
-public class TaskCampusReportingEventEntity  {
+public class TaskCampusReportingEventEntity  implements Serializable {
+
+	private static final long serialVersionUID = 1L;
 
 	/** 主键id */
 	@ApiModelProperty(value = "主键ID", example = "")
 	@TableId(value = "id", type = IdType.AUTO)
-	private Integer id;
+	private Long id;
 
 	/** 任务ID */
 	@ApiModelProperty(value = "任务ID", example = "")
@@ -52,17 +54,17 @@
 	/** 场所ID */
 	@ApiModelProperty(value = "场所ID", example = "")
 	@TableField("place_id")
-	private Integer placeId;
+	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 = "")
@@ -114,7 +116,7 @@
 	/** 确认用户ID */
 	@ApiModelProperty(value = "确认用户ID", example = "")
 	@TableField("confirm_user_id")
-	private Integer confirmUserId;
+	private Long confirmUserId;
 
 	/** 确认用户ID */
 	@ApiModelProperty(value = "确认用户ID", example = "")
@@ -126,8 +128,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;
 
@@ -201,14 +205,64 @@
 	@TableField("high_altitude_monitor")
 	private String highAltitudeMonitor;
 
-	/** 高空抛物监控照片 */
+	/**
+	 * 高空抛物监控照片
+	 */
 	@ApiModelProperty(value = "高空抛物监控照片", example = "")
 	@TableField("ha_image_urls")
 	private String haImageUrls;
 
-	/** 四个一工程照片 */
+	/**
+	 * 四个一工程照片
+	 */
 	@ApiModelProperty(value = "四个一工程照片", example = "")
 	@TableField("fo_image_urls")
 	private String foImageUrls;
 
+	/**
+	 * 来源: 1:主动上报  2:系统自动下发
+	 */
+	@ApiModelProperty(value = "来源: 1:主动上报  2:系统自动下发")
+	private Integer source;
+
+	/**
+	 * 创建时间
+	 */
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty("创建时间")
+	@TableField(fill = FieldFill.INSERT)
+	private Date createTime;
+
+	/**
+	 * 创建人
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty("创建人")
+	@TableField(fill = FieldFill.INSERT)
+	private Long 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