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