From 238101bb93896f1fa100ea92f7694bb90d3f70fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Thu, 7 Aug 2025 16:11:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E6=9C=9F=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8F=98=E9=87=8F=E5=AD=98=E6=94=BE=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/production/controller/DailyPlanController.java   | 5 +++++
 .../com/heai/modules/production/entity/ReworkRecordData.java | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
index b419fb6..7b5c029 100644
--- a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
+++ b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
@@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -1123,6 +1125,9 @@ public class DailyPlanController {
         if (list.size() > 1){
             throw new RuntimeException("派工单"+list.get(0).getSeqNo()+"存在多条返工返修单,请找到具体返工返修单报工");
         }
+        Date createTime = list.get(0).getCreateTime();
+        LocalDate localDate = createTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+        list.get(0).setCreateTime2(localDate);
         return R.ok().put("row",list.get(0));
     }
 
diff --git a/src/main/java/com/heai/modules/production/entity/ReworkRecordData.java b/src/main/java/com/heai/modules/production/entity/ReworkRecordData.java
index 0a2ee6e..70afa70 100644
--- a/src/main/java/com/heai/modules/production/entity/ReworkRecordData.java
+++ b/src/main/java/com/heai/modules/production/entity/ReworkRecordData.java
@@ -11,6 +11,7 @@ import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.Date;
 
 /**
@@ -33,6 +34,8 @@ public class ReworkRecordData extends ReworkRecord{
     private String originOperatorName;
 
     private BigDecimal qtyApprove;
-
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate createTime2;
 }