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

Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

Browse Source
This commit is contained in:
liguoyang
2024-03-18 11:03:45 +08:00
parent 5fe4104ff6 3b46ac25a7
commit 63ded819c5
5 changed files with 50 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

40
Src/Dlhis.Basic/Dishes/Response/BusinessShiftMealRelationshipResponse.cs Normal file
View File

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

33
Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs
View File

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

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

@@ -10,6 +10,6 @@ public interface IDishesService : IScopeDependency
Task SaveDishesAsync(DishesSaveRequest request);
Task<List<GetDishesMenusBookingResponse>> GetDishesMenusBookingSetting(Guid PLaceCode);
Task<GetDishesMenusBookingResponse> GetDishesMenusBookingSetting(Guid PLaceCode);
}

11
Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs
View File

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