DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

规范日期解决报错

Browse Source
This commit is contained in:
Joshi
2025-07-15 16:53:25 +08:00
parent 6b53156e1e
commit b524e12fb5
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProjectSchedule.java
View File

@@ -10,6 +10,7 @@ import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
/** /**
* 项目进度对象 oa_project_schedule * 项目进度对象 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; private Date startTime;
/** /**
* 进度完成时间 * 进度完成时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endTime; private Date endTime;
/** /**
* 状态 * 状态

5
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaReportScheduleBo.java
View File

@@ -11,6 +11,7 @@ import java.util.Date;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
/** /**
* 项目排产业务对象 oa_report_schedule * 项目排产业务对象 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; private Date startDate;
/** /**
* 结束日期 * 结束日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endDate; private Date endDate;
/** /**

6
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaReportScheduleVo.java
View File

@@ -7,6 +7,8 @@ import com.alibaba.excel.annotation.ExcelProperty;
import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert; import com.ruoyi.common.convert.ExcelDictConvert;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
@@ -52,12 +54,16 @@ public class OaReportScheduleVo {
* 开始日期 * 开始日期
*/ */
@ExcelProperty(value = "开始日期") @ExcelProperty(value = "开始日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date startDate; private Date startDate;
/** /**
* 结束日期 * 结束日期
*/ */
@ExcelProperty(value = "结束日期") @ExcelProperty(value = "结束日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endDate; private Date endDate;
/** /**