From d257df697f5d484825a7e698127640442e5150e2 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Tue, 9 Apr 2024 17:36:28 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E9=A4=90=E6=AC=A1=E6=AE=B5=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/BusinessShiftsController.cs          |  6 +++---
 .../BusinessPlaceShiftSaveMealShiftRequest.cs        | 12 +++++++++++-
 .../Services/Implements/BusinessPlaceShiftService.cs |  5 ++++-
 3 files changed, 18 insertions(+), 5 deletions(-)

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
     }
 
     /// <summary>
-    /// 餐次分页
+    /// 餐别分页
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
@@ -35,7 +35,7 @@ public class BusinessShiftsController : ControllerBase
     }
 
     /// <summary>
-    /// 餐次列表
+    /// 餐别列表
     /// </summary>
     /// <returns></returns>
     [HttpGet("list")]
@@ -45,7 +45,7 @@ public class BusinessShiftsController : ControllerBase
     }
 
     /// <summary>
-    /// 餐次保存
+    /// 餐别保存
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
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; }
 
     /// <summary>
-    /// 餐次Code
+    /// 餐别Code
     /// </summary>
     public Guid ShiftCode { get; set; }
 
@@ -32,6 +32,16 @@ public class BusinessPlaceShiftSaveMealShiftRequest : IValidatableObject
 
     public IEnumerable<ValidationResult> 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<BusinessShiftEntity>().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<BusinessShiftMealRelationshipEntity>().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);
             }