fix 框架调整,优化数据返回

Src/Dlhis.Basic/BusinessShift/Controllers/BusinessShiftsController.cs

@@ -1,6 +1,7 @@
 using Dlhis.Basic.BusinessShift.Request;
 using Dlhis.Basic.BusinessShift.Response;
 using Dlhis.Basic.BusinessShift.Services;
+using Dlhis.Basic.Packs;
 using Kurisu.Core.DataAccess.Dto;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -49,9 +50,9 @@ public class BusinessShiftsController : ControllerBase
     /// <param name="request"></param>
     /// <returns></returns>
     [HttpPost("save")]
-    public async Task SaveAsync(BusinessPlaceShiftSaveRequest request)
+    public async Task<Guid> SaveAsync(BusinessPlaceShiftSaveRequest request)
     {
-        await _businessPlaceShiftService.SaveAsync(request);
+        return await _businessPlaceShiftService.SaveAsync(request);
     }
 
     /// <summary>
@@ -60,6 +61,7 @@ public class BusinessShiftsController : ControllerBase
     /// <param name="requests"></param>
     /// <returns></returns>
     [HttpPost("meal/save")]
+    [Transactional]
     public async Task SaveMealShiftsAsync(List<BusinessPlaceShiftSaveMealShiftRequest> requests)
     {
         await _businessPlaceShiftService.SaveMealShiftsAsync(requests);

Src/Dlhis.Basic/BusinessShift/Response/BusinessPlaceShiftResponse.cs

@@ -18,4 +18,9 @@ public class BusinessPlaceShiftResponse
     /// 餐次名称
     /// </summary>
     public string Name { get; set; }
+
+    /// <summary>
+    /// 就餐时间段
+    /// </summary>
+    public List<MealShiftResponse> MealShifts { get; set; }
 }

Src/Dlhis.Basic/BusinessShift/Response/MealShiftResponse.cs

@@ -0,0 +1,13 @@
+namespace Dlhis.Basic.BusinessShift.Response
+{
+    public class MealShiftResponse
+    {
+        public Guid ShiftCode { get; set; }
+
+        public string Name { get; set; }
+
+        public TimeOnly Start { get; set; }
+
+        public TimeOnly End { get; set; }
+    }
+}

Src/Dlhis.Basic/BusinessShift/Services/IBusinessPlaceShiftService.cs

@@ -11,7 +11,7 @@ public interface IBusinessPlaceShiftService : IScopeDependency
 
     Task<List<BusinessPlaceShiftResponse>> GetListAsync();
 
-    Task SaveAsync(BusinessPlaceShiftSaveRequest request);
+    Task<Guid> SaveAsync(BusinessPlaceShiftSaveRequest request);
 
     Task SaveMealShiftsAsync(List<BusinessPlaceShiftSaveMealShiftRequest> requests);
 

Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs

@@ -7,7 +7,6 @@ using Kurisu.AspNetCore.Utils.Extensions;
 using Kurisu.Core.CustomClass;
 using Kurisu.Core.DataAccess.Dto;
 using Kurisu.Core.Result;
-using Kurisu.SqlSugar.Attributes;
 using Kurisu.SqlSugar.Extensions;
 using Kurisu.SqlSugar.Services;
 using Mapster;
@@ -32,6 +31,26 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService
                 .Select<BusinessPlaceShiftResponse>()
                .ToPageListAsync(request);
 
+        var shiftCodes = page.Data.Select(x => x.Code).ToList();
+
+        //下级就餐时间段
+        var mealShifts = await _dbContext.Queryable<BusinessShiftMealRelationshipEntity>()
+                .LeftJoin<BasicTypeEntity>((x, bt) => x.ShiftType == bt.Code)
+                .Where(x => shiftCodes.Contains(x.ShiftCode))
+                .Select((x, bt) => new MealShiftResponse
+                {
+                    ShiftCode = x.ShiftCode,
+                    Name = bt.Display,
+                    Start = x.Start,
+                    End = x.End,
+                })
+                .ToListAsync();
+
+        page.Data.ForEach(x =>
+        {
+            x.MealShifts = mealShifts.Where(item => item.ShiftCode == x.Code).ToList();
+        });
+
         return page;
     }
 
@@ -43,16 +62,19 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService
         return result;
     }
 
-    public async Task SaveAsync(BusinessPlaceShiftSaveRequest request)
+    public async Task<Guid> SaveAsync(BusinessPlaceShiftSaveRequest request)
     {
         await CheckExistsAsync(request);
 
+        Guid code = Guid.Empty;
         if (!request.Id.HasValue)
         {
             var entity = request.Adapt<BusinessShiftEntity>();
 
             entity.Code = Guid.NewGuid();
             await _dbContext.InsertAsync(entity);
+
+            code = entity.Code;
         }
         else
         {
@@ -61,10 +83,13 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService
 
             request.Adapt(entity);
             await _dbContext.UpdateAsync(entity);
+
+            code = entity.Code;
         }
+
+        return code;
     }
 
-    [Transactional]
     public async Task SaveMealShiftsAsync(List<BusinessPlaceShiftSaveMealShiftRequest> requests)
     {
         var mealShifts = await GetMealShiftAsync();
@@ -98,7 +123,7 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService
         }
     }
 
-    [IgnoreTenant]
+
     public async Task<BusinessPlaceWithShiftResponse> GetShiftsByPlaceCustomCodeAsync(string placeCustomCode)
     {
         var place = await _dbContext.Queryable<BusinessPlaceEntity>().Where(x => x.CustomCode == placeCustomCode).FirstAsync();