From 03ee95cc6a6647033262da7db430487c6336b782 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Thu, 7 Aug 2025 11:43:59 +0800
Subject: [PATCH] =?UTF-8?q?refactor(oa):=20=E4=BC=98=E5=8C=96=E8=80=83?=
 =?UTF-8?q?=E5=8B=A4=E8=AE=B0=E5=BD=95=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 GearAttendanceRecord、GearAttendanceRecordBo 和 GearAttendanceRecordVo 类中添加 @DateTimeFormat 注解
---
 .../main/java/com/gear/oa/domain/GearAttendanceRecord.java | 5 +++++
 .../java/com/gear/oa/domain/bo/GearAttendanceRecordBo.java | 7 +++++--
 .../java/com/gear/oa/domain/vo/GearAttendanceRecordVo.java | 5 +++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/gear-oa/src/main/java/com/gear/oa/domain/GearAttendanceRecord.java b/gear-oa/src/main/java/com/gear/oa/domain/GearAttendanceRecord.java
index e0f0411..bb2dfca 100644
--- a/gear-oa/src/main/java/com/gear/oa/domain/GearAttendanceRecord.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/GearAttendanceRecord.java
@@ -9,6 +9,7 @@ import java.math.BigDecimal;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 import com.gear.common.core.domain.BaseEntity;
 
 /**
@@ -44,10 +45,14 @@ public class GearAttendanceRecord extends BaseEntity {
     /**
      * 开始时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
     /**
      * 结束时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
     /**
      * 时长(小时) - 用于考勤/加班/出差
diff --git a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearAttendanceRecordBo.java b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearAttendanceRecordBo.java
index a67b7e7..678abcf 100644
--- a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearAttendanceRecordBo.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearAttendanceRecordBo.java
@@ -10,6 +10,7 @@ import java.util.Date;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 import com.gear.common.core.domain.BaseEntity;
 
 /**
@@ -45,13 +46,15 @@ public class GearAttendanceRecordBo extends BaseEntity {
     /**
      * 开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSX", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
     /**
      * 结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSX", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
     /**
diff --git a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearAttendanceRecordVo.java b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearAttendanceRecordVo.java
index 2b95f26..4e385fa 100644
--- a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearAttendanceRecordVo.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearAttendanceRecordVo.java
@@ -2,6 +2,7 @@ package com.gear.oa.domain.vo;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.gear.common.annotation.ExcelDictFormat;
@@ -51,12 +52,16 @@ public class GearAttendanceRecordVo {
      * 开始时间
      */
     @ExcelProperty(value = "开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
     /**
      * 结束时间
      */
     @ExcelProperty(value = "结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
     /**