From d25909a2359ab3beb5831d09c2144218444227d9 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 21 Mar 2024 20:51:20 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=8F=9C=E5=8D=95=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dishes/Controller/DishesMenusController.cs     |  7 ++++---
 .../Dishes/Services/IDishesMenuService.cs          |  2 +-
 .../Services/Implements/DishesMenuService.cs       | 14 ++++++++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs b/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs
index 555e8517..7014f9bd 100644
--- a/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs
+++ b/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs
@@ -43,12 +43,13 @@ public class DishesMenusController : ControllerBase
     /// </summary>
     /// <param name="businessPlaceCode"></param>
     /// <param name="customCode"></param>
-    /// <param name="date"></param>
+    /// <param name="startDate"></param>
+    /// <param name="endDate"></param>
     /// <returns></returns>
     [HttpGet("detail")]
-    public async Task<DishesMenuSaveRequest> GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime date)
+    public async Task<DishesMenuSaveRequest> GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime startDate, DateTime endDate)
     {
-        return await _dishesMenuService.GetDishesMenuDetailAsync(businessPlaceCode, customCode, date);
+        return await _dishesMenuService.GetDishesMenuDetailAsync(businessPlaceCode, customCode, startDate, endDate);
     }
 
     /// <summary>
diff --git a/Src/Dlhis.Basic/Dishes/Services/IDishesMenuService.cs b/Src/Dlhis.Basic/Dishes/Services/IDishesMenuService.cs
index b3256deb..718b1efc 100644
--- a/Src/Dlhis.Basic/Dishes/Services/IDishesMenuService.cs
+++ b/Src/Dlhis.Basic/Dishes/Services/IDishesMenuService.cs
@@ -10,7 +10,7 @@ public interface IDishesMenuService : IScopeDependency
 {
     Task<Pagination<DishesMenuPageResponse>> GetDishesMenuPageAsync(DisheMenuPageRequest request);
 
-    Task<DishesMenuSaveRequest> GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime date);
+    Task<DishesMenuSaveRequest> GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime startDate, DateTime endDate);
 
     Task<List<DishesDetailResponse>> GetDishesUnderCurrentMenuAsync(Guid businessPlaceCode, DateTime date, ShiftEnumType? shiftType, Guid categoryCode);
 
diff --git a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs
index 9c4dd628..775a1570 100644
--- a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs
+++ b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs
@@ -40,14 +40,24 @@ public class DishesMenuService : IDishesMenuService
             .ToPageListAsync(request);
     }
 
-    public async Task<DishesMenuSaveRequest> GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime date)
+    public async Task<DishesMenuSaveRequest> GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime startDate, DateTime endDate)
     {
         var data = await _dbContext.Queryable<DishesMenuEntity>()
               .Where(x => x.BusinessPlaceCode == businessPlaceCode)
               .Where(x => x.CustomCode == customCode)
-              .Where(x => x.StartDate >= date && x.EndDate <= date)
+              .Where(x => x.StartDate == startDate)
+              .Where(x => x.EndDate == endDate)
               .ToListAsync();
 
+        if (data.IsEmpty())
+        {
+            return new DishesMenuSaveRequest
+            {
+                BusinessPlaceCode = businessPlaceCode,
+                Items = new List<DishesMenuNameDateSaveRequest> { }
+            };
+        }
+
         return new DishesMenuSaveRequest
         {
             BusinessPlaceCode = businessPlaceCode,