From ec76603770a76f26b346c2e4c242d9ff24d87865 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Wed, 26 Nov 2025 17:33:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E8=B0=83=E6=95=B4=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=BF=9B=E5=BA=A6=E4=B8=8E=E9=9C=80=E6=B1=82=E6=88=AA?= =?UTF-8?q?=E6=AD=A2=E6=97=A5=E6=9C=9F=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 OaProjectScheduleBo 中 startTime 和 endTime 字段的时间格式从 yyyy-MM-dd 调整为 yyyy-MM-dd HH:mm:ss - 将 OaReportSummaryBo 中 reportDate 字段的时间格式从 yyyy-MM-dd 调整为 yyyy-MM-dd HH:mm:ss - 将 OaRequirementsBo 中 deadline 字段的时间格式从 yyyy-MM-dd 调整为 yyyy-MM-dd HH:mm:ss --- .../java/com/ruoyi/oa/domain/bo/OaProjectScheduleBo.java | 8 ++++---- .../java/com/ruoyi/oa/domain/bo/OaReportSummaryBo.java | 4 ++-- .../java/com/ruoyi/oa/domain/bo/OaRequirementsBo.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleBo.java index baf1aac..b1bbb4b 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleBo.java @@ -51,15 +51,15 @@ public class OaProjectScheduleBo extends BaseEntity { /** * 进度开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; /** * 进度完成时间 */ - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; /** diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaReportSummaryBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaReportSummaryBo.java index 30d68f7..d6733c6 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaReportSummaryBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaReportSummaryBo.java @@ -40,8 +40,8 @@ public class OaReportSummaryBo extends BaseEntity { * 汇报日期 */ @NotNull(message = "汇报日期不能为空", groups = { AddGroup.class, EditGroup.class }) - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date reportDate; /** diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaRequirementsBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaRequirementsBo.java index 214d157..f821ac0 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaRequirementsBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaRequirementsBo.java @@ -57,8 +57,8 @@ public class OaRequirementsBo extends BaseEntity { /** * 截止日期(最终时间) */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date deadline; /**