From 882385e601e57cf93227d05bf70749d7ac110f23 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 15:24:18 +0800
Subject: [PATCH] bug修复

---
 src/main/java/org/springblade/modules/task/entity/TaskCampusReportingEventEntity.java |  277 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 143 insertions(+), 134 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 8a460e7..a17d1ad 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskCampusReportingEventEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskCampusReportingEventEntity.java
@@ -16,7 +16,11 @@
  */
 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.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -33,173 +37,178 @@
 @Data
 @TableName("jczz_task_campus_reporting_event")
 @ApiModel(value = "TaskCampusReportingEvent对象", description = "校园安全检查任务表")
-@EqualsAndHashCode(callSuper = true)
-public class TaskCampusReportingEventEntity extends TenantEntity {
+public class TaskCampusReportingEventEntity  {
 
-	/**
-	 * 任务ID
-	 */
-	@ApiModelProperty(value = "任务ID")
+	/** 主键id */
+	@ApiModelProperty(value = "主键ID", example = "")
+	// @TableId(value = "id", type = IdType.AUTO)
+	private Long id;
+
+	/** 任务ID */
+	@ApiModelProperty(value = "任务ID", example = "")
+	@TableField("task_id")
 	private Long taskId;
-	/**
-	 * 场所ID
-	 */
-	@ApiModelProperty(value = "场所ID")
+
+	/** 场所ID */
+	@ApiModelProperty(value = "场所ID", example = "")
+	@TableField("place_id")
 	private Integer placeId;
-	/**
-	 * 小区ID
-	 */
-	@ApiModelProperty(value = "小区ID")
+
+	/** 小区ID */
+	@ApiModelProperty(value = "小区ID", example = "")
+	@TableField("district_id")
 	private String districtId;
-	/**
-	 * 小区名称
-	 */
-	@ApiModelProperty(value = "小区名称")
+
+	/** 小区名称 */
+	@ApiModelProperty(value = "小区名称", example = "")
+	@TableField("district_name")
 	private String districtName;
-	/**
-	 * 自查时间
-	 */
-	@ApiModelProperty(value = "自查时间")
+
+	/** 自查时间 */
+	@ApiModelProperty(value = "自查时间", example = "")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@TableField("check_time")
 	private Date checkTime;
-	/**
-	 * 自查人姓名
-	 */
-	@ApiModelProperty(value = "自查人姓名")
+
+	/** 自查人姓名 */
+	@ApiModelProperty(value = "自查人姓名", example = "")
+	@TableField("check_user_id")
 	private Long checkUserId;
-	/**
-	 * 自查人姓名
-	 */
-	@ApiModelProperty(value = "自查人姓名")
+
+	/** 自查人姓名 */
+	@ApiModelProperty(value = "自查人姓名", example = "")
+	@TableField("check_user_name")
 	private String checkUserName;
-	/**
-	 * 自查人手机
-	 */
-	@ApiModelProperty(value = "自查人手机")
+
+	/** 自查人手机 */
+	@ApiModelProperty(value = "自查人手机", example = "")
+	@TableField("check_telephone")
 	private String checkTelephone;
-	/**
-	 * 自查位置
-	 */
-	@ApiModelProperty(value = "自查位置")
+
+	/** 自查位置 */
+	@ApiModelProperty(value = "自查位置", example = "")
+	@TableField("location")
 	private String location;
-	/**
-	 * 安全通道状态
-	 */
-	@ApiModelProperty(value = "安全通道状态")
+
+	/** 安全通道状态 */
+	@ApiModelProperty(value = "安全通道状态", example = "")
+	@TableField("sc_status")
 	private String scStatus;
-	/**
-	 * 安全通道图片
-	 */
-	@ApiModelProperty(value = "安全通道图片")
+
+	/** 安全通道图片 */
+	@ApiModelProperty(value = "安全通道图片", example = "")
+	@TableField("sc_image_urls")
 	private String scImageUrls;
-	/**
-	 * 未成年人入住登记本照片
-	 */
-	@ApiModelProperty(value = "未成年人入住登记本照片")
+
+	/** 未成年人入住登记本照片 */
+	@ApiModelProperty(value = "未成年人入住登记本照片", example = "")
+	@TableField("uan_image_urls")
 	private String uanImageUrls;
-	/**
-	 * 确认时间
-	 */
-	@ApiModelProperty(value = "确认时间")
+
+	/** 确认时间 */
+	@ApiModelProperty(value = "确认时间", example = "")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@TableField("confirm_time")
 	private Date confirmTime;
-	/**
-	 * 确认用户ID
-	 */
-	@ApiModelProperty(value = "确认用户ID")
+
+	/** 确认用户ID */
+	@ApiModelProperty(value = "确认用户ID", example = "")
+	@TableField("confirm_user_id")
 	private Integer confirmUserId;
-	/**
-	 * 确认用户ID
-	 */
-	@ApiModelProperty(value = "确认用户ID")
+
+	/** 确认用户ID */
+	@ApiModelProperty(value = "确认用户ID", example = "")
+	@TableField("confirm_user_name")
 	private String confirmUserName;
-	/**
-	 * 确认意见
-	 */
-	@ApiModelProperty(value = "确认意见")
+
+	/** 确认意见 */
+	@ApiModelProperty(value = "确认意见", example = "")
+	@TableField("confirm_notion")
 	private String confirmNotion;
-	/**
-	 * 确认标记
-	 */
-	@ApiModelProperty(value = "确认标记")
+
+	/** 确认标记 */
+	@ApiModelProperty(value = "确认标记", example = "")
+	@TableField("confirm_flag")
 	private String confirmFlag;
-	/**
-	 * 校园名称
-	 */
-	@ApiModelProperty(value = "校园名称")
+
+	/** 校园名称 */
+	@ApiModelProperty(value = "校园名称", example = "")
+	@TableField("campus_name")
 	private String campusName;
-	/**
-	 * 四个一
-	 */
-	@ApiModelProperty(value = "四个一")
+
+	/** 四个一 */
+	@ApiModelProperty(value = "四个一", example = "")
+	@TableField("four_one")
 	private String fourOne;
-	/**
-	 * 消防器材数量
-	 */
-	@ApiModelProperty(value = "消防器材数量")
+
+	/** 消防器材数量 */
+	@ApiModelProperty(value = "消防器材数量", example = "")
+	@TableField("fire_facs_nums")
 	private Integer fireFacsNums;
-	/**
-	 * 消防器材状态
-	 */
-	@ApiModelProperty(value = "消防器材状态")
+
+	/** 消防器材状态 */
+	@ApiModelProperty(value = "消防器材状态", example = "")
+	@TableField("fire_facs_status")
 	private String fireFacsStatus;
-	/**
-	 * 消防器材图片
-	 */
-	@ApiModelProperty(value = "消防器材图片")
+
+	/** 消防器材图片 */
+	@ApiModelProperty(value = "消防器材图片", example = "")
+	@TableField("fire_facs_image_urls")
 	private String fireFacsImageUrls;
-	/**
-	 * 消防器材种类
-	 */
-	@ApiModelProperty(value = "消防器材种类")
+
+	/** 消防器材种类 */
+	@ApiModelProperty(value = "消防器材种类", example = "")
+	@TableField("fire_facs_type")
 	private String fireFacsType;
-	/**
-	 * 校园周边安全巡查照片
-	 */
-	@ApiModelProperty(value = "校园周边安全巡查照片")
+
+	/** 校园周边安全巡查照片 */
+	@ApiModelProperty(value = "校园周边安全巡查照片", example = "")
+	@TableField("patrol_image_urls")
 	private String patrolImageUrls;
-	/**
-	 * 学校大门是否配备防撞装置
-	 */
-	@ApiModelProperty(value = "学校大门是否配备防撞装置")
+
+	/** 学校大门是否配备防撞装置 */
+	@ApiModelProperty(value = "学校大门是否配备防撞装置", example = "")
+	@TableField("anti_collision")
 	private String antiCollision;
-	/**
-	 * 校园防撞装置照片
-	 */
-	@ApiModelProperty(value = "校园防撞装置照片")
+
+	/** 校园防撞装置照片 */
+	@ApiModelProperty(value = "校园防撞装置照片", example = "")
+	@TableField("anti_collision_image_urls")
 	private String antiCollisionImageUrls;
-	/**
-	 * 专职保安人数
-	 */
-	@ApiModelProperty(value = "专职保安人数")
+
+	/** 专职保安人数 */
+	@ApiModelProperty(value = "专职保安人数", example = "")
+	@TableField("full_so_nums")
 	private Integer fullSoNums;
-	/**
-	 * 兼职保安人数
-	 */
-	@ApiModelProperty(value = "兼职保安人数")
+
+	/** 兼职保安人数 */
+	@ApiModelProperty(value = "兼职保安人数", example = "")
+	@TableField("part_so_nums")
 	private Integer partSoNums;
-	/**
-	 * 学校监控总数
-	 */
-	@ApiModelProperty(value = "学校监控总数")
+
+	/** 学校监控总数 */
+	@ApiModelProperty(value = "学校监控总数", example = "")
+	@TableField("monitor_nums")
 	private Integer monitorNums;
-	/**
-	 * 监控是否全覆盖
-	 */
-	@ApiModelProperty(value = "监控是否全覆盖")
+
+	/** 监控是否全覆盖 */
+	@ApiModelProperty(value = "监控是否全覆盖", example = "")
+	@TableField("monitor_over")
 	private String monitorOver;
-	/**
-	 * 高空抛物监控
-	 */
-	@ApiModelProperty(value = "高空抛物监控")
+
+	/** 高空抛物监控 */
+	@ApiModelProperty(value = "高空抛物监控", example = "")
+	@TableField("high_altitude_monitor")
 	private String highAltitudeMonitor;
-	/**
-	 * 高空抛物监控照片
-	 */
-	@ApiModelProperty(value = "高空抛物监控照片")
+
+	/** 高空抛物监控照片 */
+	@ApiModelProperty(value = "高空抛物监控照片", example = "")
+	@TableField("ha_image_urls")
 	private String haImageUrls;
-	/**
-	 * 四个一工程照片
-	 */
-	@ApiModelProperty(value = "四个一工程照片")
+
+	/** 四个一工程照片 */
+	@ApiModelProperty(value = "四个一工程照片", example = "")
+	@TableField("fo_image_urls")
 	private String foImageUrls;
 
 }

--
Gitblit v1.9.3