From 996e8d32584f14527711c81a344cd3f74836cda3 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 9 Aug 2025 14:18:54 +0800 Subject: [PATCH] =?UTF-8?q?refactor(oa):=20=E4=BC=98=E5=8C=96=E5=B7=A5?= =?UTF-8?q?=E8=B5=84=E5=8F=91=E6=94=BE=E8=AE=B0=E5=BD=95=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 GearSalaryRecords、GearSalaryRecordsBo 和 GearSalaryRecordsVo 类中添加 @DateTimeFormat 注解 - 统一发薪月份日期格式为 "yyyy-MM-dd HH:mm:ss" - 提高日期数据的可读性和一致性 --- .../src/main/java/com/gear/oa/domain/GearSalaryRecords.java | 2 ++ .../main/java/com/gear/oa/domain/bo/GearSalaryRecordsBo.java | 2 ++ .../main/java/com/gear/oa/domain/vo/GearSalaryRecordsVo.java | 3 +++ 3 files changed, 7 insertions(+) diff --git a/gear-oa/src/main/java/com/gear/oa/domain/GearSalaryRecords.java b/gear-oa/src/main/java/com/gear/oa/domain/GearSalaryRecords.java index 6ece278..f311e19 100644 --- a/gear-oa/src/main/java/com/gear/oa/domain/GearSalaryRecords.java +++ b/gear-oa/src/main/java/com/gear/oa/domain/GearSalaryRecords.java @@ -11,6 +11,7 @@ import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.gear.common.core.domain.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; /** * 工资发放记录对象 gear_salary_records @@ -37,6 +38,7 @@ public class GearSalaryRecords extends BaseEntity { /** * 发薪月份(YYYY-MM-01) */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date payPeriod; /** * 基本工资 diff --git a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearSalaryRecordsBo.java b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearSalaryRecordsBo.java index ccc7b1f..8faca41 100644 --- a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearSalaryRecordsBo.java +++ b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearSalaryRecordsBo.java @@ -14,6 +14,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import com.gear.common.core.domain.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; /** * 工资发放记录业务对象 gear_salary_records @@ -39,6 +40,7 @@ public class GearSalaryRecordsBo extends BaseEntity { /** * 发薪月份(YYYY-MM-01) */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date payPeriod; /** diff --git a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearSalaryRecordsVo.java b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearSalaryRecordsVo.java index 86804e1..2a34427 100644 --- a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearSalaryRecordsVo.java +++ b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearSalaryRecordsVo.java @@ -8,6 +8,8 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.gear.common.annotation.ExcelDictFormat; import com.gear.common.convert.ExcelDictConvert; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + import java.util.Date; @@ -40,6 +42,7 @@ public class GearSalaryRecordsVo { * 发薪月份(YYYY-MM-01) */ @ExcelProperty(value = "发薪月份(YYYY-MM-01)") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date payPeriod; /**