diff --git a/Src/Dlhis.Basic/BusinessShift/Controllers/BusinessShiftsController.cs b/Src/Dlhis.Basic/BusinessShift/Controllers/BusinessShiftsController.cs index 981c650b..d465d8bb 100644 --- a/Src/Dlhis.Basic/BusinessShift/Controllers/BusinessShiftsController.cs +++ b/Src/Dlhis.Basic/BusinessShift/Controllers/BusinessShiftsController.cs @@ -24,7 +24,7 @@ public class BusinessShiftsController : ControllerBase } /// - /// 餐次分页 + /// 餐别分页 /// /// /// @@ -35,7 +35,7 @@ public class BusinessShiftsController : ControllerBase } /// - /// 餐次列表 + /// 餐别列表 /// /// [HttpGet("list")] @@ -45,7 +45,7 @@ public class BusinessShiftsController : ControllerBase } /// - /// 餐次保存 + /// 餐别保存 /// /// /// diff --git a/Src/Dlhis.Basic/BusinessShift/Request/BusinessPlaceShiftSaveMealShiftRequest.cs b/Src/Dlhis.Basic/BusinessShift/Request/BusinessPlaceShiftSaveMealShiftRequest.cs index a6512432..fd7be32d 100644 --- a/Src/Dlhis.Basic/BusinessShift/Request/BusinessPlaceShiftSaveMealShiftRequest.cs +++ b/Src/Dlhis.Basic/BusinessShift/Request/BusinessPlaceShiftSaveMealShiftRequest.cs @@ -9,7 +9,7 @@ public class BusinessPlaceShiftSaveMealShiftRequest : IValidatableObject public long? Id { get; set; } /// - /// 餐次Code + /// 餐别Code /// public Guid ShiftCode { get; set; } @@ -32,6 +32,16 @@ public class BusinessPlaceShiftSaveMealShiftRequest : IValidatableObject public IEnumerable Validate(ValidationContext validationContext) { + if (TimePeriod == null) + { + yield return new ValidationResult("时间段配置错误", new[] { nameof(TimePeriod) }); + } + + if (TimePeriod?.Start == null || TimePeriod?.End == null) + { + yield return new ValidationResult("时间段配置错误", new[] { nameof(TimePeriod) }); + } + if (TimePeriod.Start == TimePeriod.End) { yield return new ValidationResult("时间段设置区间有误,开始时段不能等于结束时段.", new[] { nameof(TimePeriod) }); diff --git a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs index a920e052..11aeaab8 100644 --- a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs +++ b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs @@ -82,7 +82,7 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService else { var entity = await _dbContext.Queryable().FirstAsync(x => x.Id == request.Id); - entity.ThrowIfNull("餐次不存在"); + entity.ThrowIfNull("餐别不存在"); request.Adapt(entity); await _dbContext.UpdateAsync(entity); @@ -115,6 +115,9 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService var entity = await _dbContext.Queryable().FirstAsync(x => x.Id == request.Id); entity.ThrowIfNull("餐次段不存在"); + entity.Start = request.TimePeriod.Start.Value; + entity.End = request.TimePeriod.End.Value; + request.Adapt(entity); await _dbContext.UpdateAsync(entity); }