From e507e2572a0255fee383cdbc01dea9c88e4d245d Mon Sep 17 00:00:00 2001
From: hshansha <qingkongguiyatou@126.com>
Date: Fri, 30 May 2025 12:10:02 +0800
Subject: [PATCH 1/4] =?UTF-8?q?mapper=E4=B8=AD=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/pay/PayWorkOrderBaohuoMapper.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-pay/src/main/resources/mapper/pay/PayWorkOrderBaohuoMapper.xml b/ruoyi-pay/src/main/resources/mapper/pay/PayWorkOrderBaohuoMapper.xml
index 2e84315..d111bdf 100644
--- a/ruoyi-pay/src/main/resources/mapper/pay/PayWorkOrderBaohuoMapper.xml
+++ b/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}

From 3021e93b6b5abda94af6ad5765b34da6126db555 Mon Sep 17 00:00:00 2001
From: hshansha <qingkongguiyatou@126.com>
Date: Tue, 3 Jun 2025 15:40:52 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=8C=85=E6=B4=BB=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=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/PayBaohuoWorktime.java | 4 ++++
 .../main/java/com/ruoyi/pay/domain/PayWorkOrderBaohuo.java    | 3 +++
 .../java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java    | 3 +++
 .../java/com/ruoyi/pay/domain/vo/PayWorkOrderBaohuoVo.java    | 3 +++
 4 files changed, 13 insertions(+)

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

From 5cb5ea6ecce0ec46c5f3d9f806964e1a18468e0c Mon Sep 17 00:00:00 2001
From: hshansha <qingkongguiyatou@126.com>
Date: Tue, 3 Jun 2025 16:03:51 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=97=A5=E5=B7=A5=E5=B7=A5=E6=97=B6?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9=E3=80=81?=
 =?UTF-8?q?=E5=8C=85=E6=B4=BB=E9=9D=9E=E7=A9=BA=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=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;
 
     /**

From eae821c9150b961f6a0add7d433e38368909694c Mon Sep 17 00:00:00 2001
From: hshansha <qingkongguiyatou@126.com>
Date: Tue, 3 Jun 2025 16:26:22 +0800
Subject: [PATCH 4/4] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 8d942a6..75e3d23 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
@@ -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;
 
     /**
@@ -106,14 +106,14 @@ public class PayWorkOrderBaohuoBo extends BaseEntity {
      * 开始时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @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 })
+  //  @NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date endTime;
 
     /**