日工工时日期格式修改、包活非空字段修改

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

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;
 
 

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

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

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

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