From 11a3a0aded6d8bf3a06bf0c0e09d857e440acc0f Mon Sep 17 00:00:00 2001
From: cheche <717840555@qq.com>
Date: Mon, 18 Mar 2024 11:01:31 +0800
Subject: [PATCH] =?UTF-8?q?fix=20GetDishesMenusBookingSetting=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E4=BD=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/DishesMenusController.cs       |  2 +-
 .../BusinessShiftMealRelationshipResponse.cs  | 40 +++++++++++++++++++
 .../Response/GetDishesMenusBookingResponse.cs | 33 +--------------
 .../Dishes/Services/IDishesService.cs         |  2 +-
 .../Services/Implements/DishesService.cs      | 11 +++--
 5 files changed, 50 insertions(+), 38 deletions(-)
 create mode 100644 Src/Dlhis.Basic/Dishes/Response/BusinessShiftMealRelationshipResponse.cs

diff --git a/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs b/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs
index 9c3289c4..5d22c254 100644
--- a/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs
+++ b/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs
@@ -93,7 +93,7 @@ public class DishesMenusController : ControllerBase
     /// </summary>
     /// <returns></returns>
     [HttpGet("setting")]
-    public async Task<List<GetDishesMenusBookingResponse>> GetDishesMenusBookingSetting(Guid PLaceCode)
+    public async Task<GetDishesMenusBookingResponse> GetDishesMenusBookingSetting(Guid PLaceCode)
     {
        return await _dishesService.GetDishesMenusBookingSetting(PLaceCode);
     }
diff --git a/Src/Dlhis.Basic/Dishes/Response/BusinessShiftMealRelationshipResponse.cs b/Src/Dlhis.Basic/Dishes/Response/BusinessShiftMealRelationshipResponse.cs
new file mode 100644
index 00000000..85b71c88
--- /dev/null
+++ b/Src/Dlhis.Basic/Dishes/Response/BusinessShiftMealRelationshipResponse.cs
@@ -0,0 +1,40 @@
+using Dlhis.Entity.Canteen.Enums;
+
+namespace Dlhis.Basic.Dishes.Response
+{
+    public class BusinessShiftMealRelationshipResponse
+    {
+        /// <summary>
+        /// 餐别Code
+        /// </summary>
+        public Guid ShiftCode { get; set; }
+
+        /// <summary>
+        /// 餐别手工号
+        /// </summary>
+        public string ShiftCustomCode { get; set; }
+
+        /// <summary>
+        /// 餐次
+        /// </summary>
+        public ShiftEnumType ShiftType { get; set; }
+
+        /// <summary>
+        /// 经营开始时间
+        /// </summary>
+        public TimeOnly Start { get; set; }
+
+        /// <summary>
+        /// 经营结束时间
+        /// </summary>
+        public TimeOnly End { get; set; }
+
+        /// <summary>
+        /// 序号
+        /// </summary>
+        public int Sequence { get; set; }
+
+
+        public string TenantId { get; set; }
+    }
+}
diff --git a/Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs b/Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs
index 29fe46b4..87c5b76d 100644
--- a/Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs
+++ b/Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs
@@ -6,37 +6,6 @@ namespace Dlhis.Basic.Dishes.Response
 {
     public class GetDishesMenusBookingResponse
     {
-        /// <summary>
-        /// 餐别Code
-        /// </summary>
-        public Guid ShiftCode { get; set; }
-
-        /// <summary>
-        /// 餐别手工号
-        /// </summary>
-        public string ShiftCustomCode { get; set; }
-
-        /// <summary>
-        /// 餐次
-        /// </summary>
-        public ShiftEnumType ShiftType { get; set; }
-
-        /// <summary>
-        /// 经营开始时间
-        /// </summary>
-        public TimeOnly Start { get; set; }
-
-        /// <summary>
-        /// 经营结束时间
-        /// </summary>
-        public TimeOnly End { get; set; }
-
-        /// <summary>
-        /// 序号
-        /// </summary>
-        public int Sequence { get; set; }
-
-
-        public string TenantId { get; set; }
+        public List<BusinessShiftMealRelationshipResponse> BusinessShiftMealRelationships { get; set; }
     }
 }
diff --git a/Src/Dlhis.Basic/Dishes/Services/IDishesService.cs b/Src/Dlhis.Basic/Dishes/Services/IDishesService.cs
index 6155d573..3d7338d0 100644
--- a/Src/Dlhis.Basic/Dishes/Services/IDishesService.cs
+++ b/Src/Dlhis.Basic/Dishes/Services/IDishesService.cs
@@ -10,6 +10,6 @@ public interface IDishesService : IScopeDependency
 
     Task SaveDishesAsync(DishesSaveRequest request);
 
-    Task<List<GetDishesMenusBookingResponse>> GetDishesMenusBookingSetting(Guid PLaceCode);
+    Task<GetDishesMenusBookingResponse> GetDishesMenusBookingSetting(Guid PLaceCode);
     
 }
diff --git a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs
index f0520772..bda18ed8 100644
--- a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs
+++ b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs
@@ -49,17 +49,20 @@ public class DishesService : IDishesService
         }
     }
 
-    public async Task<List<GetDishesMenusBookingResponse>> GetDishesMenusBookingSetting(Guid PLaceCode)
+    public async Task<GetDishesMenusBookingResponse> GetDishesMenusBookingSetting(Guid PLaceCode)
     {
         var shift = await _dbContext.Queryable<BusinessPlaceShiftRelationshipEntity>()
             .Where(x => x.PlaceCode == PLaceCode)
             .FirstAsync();
 
-        var res=  await _dbContext.Queryable<BusinessShiftMealRelationshipEntity>()
+        var BusinessShiftMealRelationships=  await _dbContext.Queryable<BusinessShiftMealRelationshipEntity>()
             .Where(x => x.ShiftCode == shift.ShiftCode)
-            .Select<GetDishesMenusBookingResponse>()
+            .Select<BusinessShiftMealRelationshipResponse>()
             .ToListAsync();
-
+        var res = new GetDishesMenusBookingResponse
+        {
+            BusinessShiftMealRelationships = BusinessShiftMealRelationships,
+        };
         return res;
     }