Merge remote-tracking branch 'origin/master'

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;
 
 }

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/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;
     /**
      * 入库人员

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

@@ -51,7 +51,7 @@ public class PayWorkOrderBaohuoBo extends BaseEntity {
     /**
      * 产品ID
      */
-    @NotNull(message = "产品ID不能为空", groups = { AddGroup.class, EditGroup.class })
+  //  @NotNull(message = "产品ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long productId;
 
     /**
@@ -81,13 +81,13 @@ public class PayWorkOrderBaohuoBo extends BaseEntity {
     /**
      * 加工数量
      */
-    @NotNull(message = "加工数量不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotNull(message = "加工数量不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal productNum;
 
     /**
      * 产品单价
      */
-    @NotNull(message = "产品单价不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotNull(message = "产品单价不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal price;
 
     /**
@@ -99,19 +99,21 @@ public class PayWorkOrderBaohuoBo extends BaseEntity {
     /**
      * 加工总金额
      */
-    @NotNull(message = "加工总金额不能为空", groups = { AddGroup.class, EditGroup.class })
+  //@NotNull(message = "加工总金额不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal amount;
 
     /**
      * 开始时间
      */
-    @NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+   // @NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date beginTime;
 
     /**
      * 结束时间
      */
-    @NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @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;
 

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

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

ruoyi-pay/src/main/resources/mapper/pay/PayWorkOrderBaohuoMapper.xml

@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getWoIdSet" resultType="java.lang.Long">
-        SELECT DISTINCT wo_id FROM sgr_baohuo_worktime
+        SELECT DISTINCT wo_id FROM pay_baohuo_worktime
         <where>
             <if test="empId != null">
                 AND emp_id = #{empId}