yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 菜单明细调整

Browse Source
This commit is contained in:
liguoyang
2024-03-21 20:51:20 +08:00
parent 8915f9ff0f
commit d25909a235
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs
View File

@@ -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>

2
Src/Dlhis.Basic/Dishes/Services/IDishesMenuService.cs
View File

@@ -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);

14
Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs
View File

@@ -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,