fix 用户授权问题,档案调整,

This commit is contained in:
2024-01-08 20:49:25 +08:00
parent 598444fb96
commit bb4c617340
21 changed files with 295 additions and 236 deletions

View File

@@ -24,6 +24,11 @@ public class BusinessPlaceShiftSaveRequest : IValidatableObject
[Required(ErrorMessage = "餐次名称不能为空")]
public string Name { get; set; }
/// <summary>
/// 序号
/// </summary>
public int Sequence { get; set; } = 100;
/// <summary>
/// 时间段
/// </summary>

View File

@@ -0,0 +1,24 @@
namespace Dlhis.Basic.BusinessShift.Response;
public class BusinessPlaceShiftTinyResponse
{
/// <summary>
/// 自定义代号
/// </summary>
public string CustomCode { get; set; }
/// <summary>
/// 餐次名称
/// </summary>
public string Name { get; set; }
/// <summary>
/// 经营开始时间
/// </summary>
public TimeOnly Start { get; set; }
/// <summary>
/// 经营结束时间
/// </summary>
public TimeOnly End { get; set; }
}

View File

@@ -76,22 +76,21 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService
{
return new BusinessPlaceWithShiftResponse()
{
Shifts = new List<BusinessPlaceShiftResponse>()
Shifts = new List<BusinessPlaceShiftTinyResponse>()
};
}
var shifts = await _dbContext.Queryable<CanteenBusinessShiftEntity>().Where(x => x.BusinessPlaceCode == place.Code).ToListAsync();
var shifts = await _dbContext.Queryable<CanteenBusinessShiftEntity>()
.Where(x => x.BusinessPlaceCode == place.Code)
.OrderBy(x => x.Sequence) //排序
.ToListAsync();
return new BusinessPlaceWithShiftResponse
{
CustomCode = placeCustomCode,
Name = place.Name,
Shifts = shifts.Select(shift => new BusinessPlaceShiftResponse
Shifts = shifts.Select(shift => new BusinessPlaceShiftTinyResponse
{
Id = shift.Id,
BusinessPlaceCode = place.Code,
BusinessPlaceCustomCode = place.CustomCode,
BusinessPlace = place.Name,
Code = shift.Code,
CustomCode = shift.CustomCode,
Name = shift.Name,
Start = shift.Start,