From 8708c1755518cef00ab98fa05c6ddcabedccbc37 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 28 May 2025 08:51:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8F=9C=E8=B0=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/canteen/core/cook/dto/CookRecipeDetailDTO.java   | 3 ++-
 .../canteen/core/cook/service/impl/CookRecipeServiceImpl.java  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/CookRecipeDetailDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/CookRecipeDetailDTO.java
index 0b1f62e..9af1867 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/CookRecipeDetailDTO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/CookRecipeDetailDTO.java
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 
@@ -39,7 +40,7 @@ public class CookRecipeDetailDTO extends BaseEntity {
     @ApiModelProperty(value = "启用时间(天)")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "启用时间(天)", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date applyDate;
+    private LocalDate applyDate;
 
     /** 启用时间(周) */
     @Excel(name = "启用时间(周)")
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java
index de3e41e..fb9ff90 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java
@@ -155,7 +155,8 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
 
     private void insertDetailAndDishes(CookRecipeDTO cookRecipeDTO, CookRecipeDateDTO recipeDateDTO, CookRecipeDetailDTO detailDTO) {
         CookRecipeDetail cookRecipeDetail = new CookRecipeDetail();
-        BeanUtils.copyProperties(recipeDateDTO, detailDTO);
+        detailDTO.setApplyDate(recipeDateDTO.getApplyDate());
+        detailDTO.setApplyWeek(recipeDateDTO.getApplyWeek());
         BeanUtils.copyProperties(detailDTO, cookRecipeDetail);
         cookRecipeDetail.setRecipeId(cookRecipeDTO.getRecipeId());
         if (Objects.isNull(cookRecipeDetail.getApplyDate())) {