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; /**