From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复

---
 src/main/java/org/springblade/modules/task/entity/TaskBailReportingEventEntity.java |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/entity/TaskBailReportingEventEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskBailReportingEventEntity.java
index 18ed4c8..f8bef8a 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskBailReportingEventEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskBailReportingEventEntity.java
@@ -16,13 +16,17 @@
  */
 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.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 取保候审任务 实体类
@@ -55,7 +59,7 @@
 	 * 自查人姓名
 	 */
 	@ApiModelProperty(value = "自查人姓名")
-	private Integer checkUserId;
+	private Long checkUserId;
 	/**
 	 * 自查人姓名
 	 */
@@ -75,6 +79,8 @@
 	 * 确认时间
 	 */
 	@ApiModelProperty(value = "确认时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date confirmTime;
 	/**
 	 * 确认用户ID
@@ -100,6 +106,8 @@
 	 * 申请时间
 	 */
 	@ApiModelProperty(value = "申请时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date applyTime;
 	/**
 	 * 外出原因
@@ -130,6 +138,8 @@
 	 * 出发-当前时间
 	 */
 	@ApiModelProperty(value = "出发-当前时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date startTime;
 	/**
 	 * 出发-报备位置
@@ -145,6 +155,8 @@
 	 * 到达-当前时间
 	 */
 	@ApiModelProperty(value = "到达-当前时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date reachTime;
 	/**
 	 * 到达-报备位置
@@ -160,6 +172,8 @@
 	 * 返回-当前时间
 	 */
 	@ApiModelProperty(value = "返回-当前时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date returnTime;
 	/**
 	 * 返回-报备位置
@@ -172,4 +186,16 @@
 	@ApiModelProperty(value = "返回-位置图片")
 	private String returnImageUrls;
 
+	@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;
+
+	@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;
+
 }

--
Gitblit v1.9.3