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 /// /// /// - /// + /// + /// /// [HttpGet("detail")] - public async Task GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime date) + public async Task GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime startDate, DateTime endDate) { - return await _dishesMenuService.GetDishesMenuDetailAsync(businessPlaceCode, customCode, date); + return await _dishesMenuService.GetDishesMenuDetailAsync(businessPlaceCode, customCode, startDate, endDate); } /// 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> GetDishesMenuPageAsync(DisheMenuPageRequest request); - Task GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime date); + Task GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime startDate, DateTime endDate); Task> 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 GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime date) + public async Task GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime startDate, DateTime endDate) { var data = await _dbContext.Queryable() .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 { } + }; + } + return new DishesMenuSaveRequest { BusinessPlaceCode = businessPlaceCode,