diff --git a/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanDetailBo.java b/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanDetailBo.java index 4161084c..2a5e634a 100644 --- a/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanDetailBo.java +++ b/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanDetailBo.java @@ -8,6 +8,7 @@ import javax.validation.constraints.*; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; /** * 排产单明细业务对象 aps_plan_detail @@ -203,11 +204,15 @@ public class ApsPlanDetailBo extends BaseEntity { /** * 生产开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date startTime; /** * 生产结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date endTime; /** diff --git a/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanSheetBo.java b/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanSheetBo.java index e376e591..56d83fff 100644 --- a/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanSheetBo.java +++ b/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanSheetBo.java @@ -7,6 +7,7 @@ import javax.validation.constraints.*; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; /** * 排产单主业务对象 aps_plan_sheet @@ -27,6 +28,8 @@ public class ApsPlanSheetBo extends BaseEntity { /** * 排产日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date planDate; /** diff --git a/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanDetail.java b/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanDetail.java index 50d5eded..35afb282 100644 --- a/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanDetail.java +++ b/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanDetail.java @@ -1,9 +1,11 @@ package com.klp.aps.domain.entity; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import com.klp.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; @@ -169,10 +171,14 @@ public class ApsPlanDetail extends BaseEntity { /** * 生产开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; /** * 生产结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; /** * 备注 diff --git a/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanSheet.java b/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanSheet.java index aa2a3037..5824e30c 100644 --- a/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanSheet.java +++ b/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanSheet.java @@ -1,9 +1,11 @@ package com.klp.aps.domain.entity; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import com.klp.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -28,6 +30,8 @@ public class ApsPlanSheet extends BaseEntity { /** * 排产日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date planDate; /** * 产线ID diff --git a/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanDetailVo.java b/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanDetailVo.java index 23834f11..2eb19ff2 100644 --- a/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanDetailVo.java +++ b/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanDetailVo.java @@ -8,6 +8,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.klp.common.annotation.ExcelDictFormat; import com.klp.common.convert.ExcelDictConvert; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** @@ -242,12 +243,16 @@ public class ApsPlanDetailVo { * 生产开始时间 */ @ExcelProperty(value = "生产开始时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; /** * 生产结束时间 */ @ExcelProperty(value = "生产结束时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; /** diff --git a/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanSheetVo.java b/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanSheetVo.java index f882da47..bc762926 100644 --- a/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanSheetVo.java +++ b/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanSheetVo.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.klp.common.annotation.ExcelDictFormat; import com.klp.common.convert.ExcelDictConvert; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** @@ -31,6 +32,8 @@ public class ApsPlanSheetVo { * 排产日期 */ @ExcelProperty(value = "排产日期") + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date planDate; /**