diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayBaohuoWorktime.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayBaohuoWorktime.java index 1ae771f..c4610d9 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayBaohuoWorktime.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayBaohuoWorktime.java @@ -49,10 +49,12 @@ public class PayBaohuoWorktime extends BaseEntity { /** * 开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date stime; /** * 结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date etime; /** * 有效时长 @@ -61,10 +63,12 @@ public class PayBaohuoWorktime extends BaseEntity { /** * 工作日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") private Date date; /** * 入库日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") private Date intime; } diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayWorkOrderBaohuo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayWorkOrderBaohuo.java index b26f935..3a9a7c6 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayWorkOrderBaohuo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayWorkOrderBaohuo.java @@ -77,10 +77,12 @@ public class PayWorkOrderBaohuo extends BaseEntity { /** * 开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date beginTime; /** * 结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; /** * 质检人员 @@ -93,6 +95,7 @@ public class PayWorkOrderBaohuo extends BaseEntity { /** * 入库时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") private Date instorageTime; /** * 入库人员 diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java index 0ef77ab..1bebdb2 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java @@ -105,12 +105,14 @@ public class PayWorkOrderBaohuoBo extends BaseEntity { /** * 开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class }) private Date beginTime; /** * 结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class }) private Date endTime; @@ -129,6 +131,7 @@ public class PayWorkOrderBaohuoBo extends BaseEntity { /** * 入库时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") @NotNull(message = "入库时间不能为空", groups = { AddGroup.class, EditGroup.class }) private Date instorageTime; diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayWorkOrderBaohuoVo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayWorkOrderBaohuoVo.java index f49b08a..c3c7dd9 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayWorkOrderBaohuoVo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayWorkOrderBaohuoVo.java @@ -115,12 +115,14 @@ public class PayWorkOrderBaohuoVo { * 开始时间 */ @ExcelProperty(value = "开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date beginTime; /** * 结束时间 */ @ExcelProperty(value = "结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; /** @@ -139,6 +141,7 @@ public class PayWorkOrderBaohuoVo { * 入库时间 */ @ExcelProperty(value = "入库时间") + @JsonFormat(pattern = "yyyy-MM-dd") private Date instorageTime; /**