From 5cb5ea6ecce0ec46c5f3d9f806964e1a18468e0c Mon Sep 17 00:00:00 2001 From: hshansha Date: Tue, 3 Jun 2025 16:03:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B7=A5=E5=B7=A5=E6=97=B6=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9=E3=80=81=E5=8C=85?= =?UTF-8?q?=E6=B4=BB=E9=9D=9E=E7=A9=BA=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/pay/domain/PayDwHoursContrast.java | 2 ++ .../main/java/com/ruoyi/pay/domain/bo/PayDayWorkHoursBo.java | 3 ++- .../java/com/ruoyi/pay/domain/bo/PayDwHoursContrastBo.java | 2 ++ .../java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java | 2 +- .../main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursVo.java | 1 + .../java/com/ruoyi/pay/domain/vo/PayDwHoursContrastVo.java | 2 ++ 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayDwHoursContrast.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayDwHoursContrast.java index 15e7298..d4762a9 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayDwHoursContrast.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayDwHoursContrast.java @@ -49,10 +49,12 @@ public class PayDwHoursContrast extends BaseEntity { /** * 上午开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; /** * 上午结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; /** * 时长 diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDayWorkHoursBo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDayWorkHoursBo.java index 8f46232..5bac233 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDayWorkHoursBo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDayWorkHoursBo.java @@ -62,6 +62,7 @@ public class PayDayWorkHoursBo extends BaseEntity { /** * 日工日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") @NotNull(message = "日工日期不能为空", groups = { AddGroup.class, EditGroup.class }) private Date date; @@ -74,7 +75,7 @@ public class PayDayWorkHoursBo extends BaseEntity { /** * 备注 */ - @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) private String note; diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDwHoursContrastBo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDwHoursContrastBo.java index 7191775..f1799a8 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDwHoursContrastBo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDwHoursContrastBo.java @@ -58,12 +58,14 @@ public class PayDwHoursContrastBo extends BaseEntity { * 上午开始时间 */ @NotNull(message = "上午开始时间不能为空", groups = { AddGroup.class, EditGroup.class }) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; /** * 上午结束时间 */ @NotNull(message = "上午结束时间不能为空", groups = { AddGroup.class, EditGroup.class }) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; /** 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 1bebdb2..8d942a6 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 @@ -99,7 +99,7 @@ public class PayWorkOrderBaohuoBo extends BaseEntity { /** * 加工总金额 */ - @NotNull(message = "加工总金额不能为空", groups = { AddGroup.class, EditGroup.class }) + //@NotNull(message = "加工总金额不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal amount; /** diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursVo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursVo.java index 3ca4224..522a3f7 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursVo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursVo.java @@ -63,6 +63,7 @@ public class PayDayWorkHoursVo { * 日工日期 */ @ExcelProperty(value = "日工日期") + @JsonFormat(pattern = "yyyy-MM-dd") private Date date; /** diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDwHoursContrastVo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDwHoursContrastVo.java index 56d6089..3ac853e 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDwHoursContrastVo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDwHoursContrastVo.java @@ -58,12 +58,14 @@ public class PayDwHoursContrastVo { * 上午开始时间 */ @ExcelProperty(value = "上午开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; /** * 上午结束时间 */ @ExcelProperty(value = "上午结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; /**