From b524e12fb5c98b2da281bf04392d8cb8b6ffee91 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 15 Jul 2025 16:53:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E6=97=A5=E6=9C=9F=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/oa/domain/OaProjectSchedule.java    | 5 +++++
 .../java/com/ruoyi/oa/domain/bo/OaReportScheduleBo.java     | 5 +++++
 .../java/com/ruoyi/oa/domain/vo/OaReportScheduleVo.java     | 6 ++++++
 3 files changed, 16 insertions(+)

diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProjectSchedule.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProjectSchedule.java
index 9a21f2b..e64db6d 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProjectSchedule.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProjectSchedule.java
@@ -10,6 +10,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 项目进度对象 oa_project_schedule
@@ -44,10 +45,14 @@ public class OaProjectSchedule extends BaseEntity {
     /**
      * 进度开始时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date startTime;
     /**
      * 进度完成时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
     /**
      * 状态
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaReportScheduleBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaReportScheduleBo.java
index 1159499..8b4865e 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaReportScheduleBo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaReportScheduleBo.java
@@ -11,6 +11,7 @@ import java.util.Date;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 项目排产业务对象 oa_report_schedule
@@ -46,11 +47,15 @@ public class OaReportScheduleBo extends BaseEntity {
     /**
      * 开始日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date startDate;
 
     /**
      * 结束日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endDate;
 
     /**
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaReportScheduleVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaReportScheduleVo.java
index a8daa34..017870a 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaReportScheduleVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaReportScheduleVo.java
@@ -7,6 +7,8 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.util.Date;
 
 
@@ -52,12 +54,16 @@ public class OaReportScheduleVo {
      * 开始日期
      */
     @ExcelProperty(value = "开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date startDate;
 
     /**
      * 结束日期
      */
     @ExcelProperty(value = "结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endDate;
 
     /**