diff --git a/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs b/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs
index 9c3289c4..5d22c254 100644
--- a/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs
+++ b/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs
@@ -93,7 +93,7 @@ public class DishesMenusController : ControllerBase
///
///
[HttpGet("setting")]
- public async Task> GetDishesMenusBookingSetting(Guid PLaceCode)
+ public async Task GetDishesMenusBookingSetting(Guid PLaceCode)
{
return await _dishesService.GetDishesMenusBookingSetting(PLaceCode);
}
diff --git a/Src/Dlhis.Basic/Dishes/Response/BusinessShiftMealRelationshipResponse.cs b/Src/Dlhis.Basic/Dishes/Response/BusinessShiftMealRelationshipResponse.cs
new file mode 100644
index 00000000..85b71c88
--- /dev/null
+++ b/Src/Dlhis.Basic/Dishes/Response/BusinessShiftMealRelationshipResponse.cs
@@ -0,0 +1,40 @@
+using Dlhis.Entity.Canteen.Enums;
+
+namespace Dlhis.Basic.Dishes.Response
+{
+ public class BusinessShiftMealRelationshipResponse
+ {
+ ///
+ /// 餐别Code
+ ///
+ public Guid ShiftCode { get; set; }
+
+ ///
+ /// 餐别手工号
+ ///
+ public string ShiftCustomCode { get; set; }
+
+ ///
+ /// 餐次
+ ///
+ public ShiftEnumType ShiftType { get; set; }
+
+ ///
+ /// 经营开始时间
+ ///
+ public TimeOnly Start { get; set; }
+
+ ///
+ /// 经营结束时间
+ ///
+ public TimeOnly End { get; set; }
+
+ ///
+ /// 序号
+ ///
+ public int Sequence { get; set; }
+
+
+ public string TenantId { get; set; }
+ }
+}
diff --git a/Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs b/Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs
index 29fe46b4..87c5b76d 100644
--- a/Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs
+++ b/Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs
@@ -6,37 +6,6 @@ namespace Dlhis.Basic.Dishes.Response
{
public class GetDishesMenusBookingResponse
{
- ///
- /// 餐别Code
- ///
- public Guid ShiftCode { get; set; }
-
- ///
- /// 餐别手工号
- ///
- public string ShiftCustomCode { get; set; }
-
- ///
- /// 餐次
- ///
- public ShiftEnumType ShiftType { get; set; }
-
- ///
- /// 经营开始时间
- ///
- public TimeOnly Start { get; set; }
-
- ///
- /// 经营结束时间
- ///
- public TimeOnly End { get; set; }
-
- ///
- /// 序号
- ///
- public int Sequence { get; set; }
-
-
- public string TenantId { get; set; }
+ public List BusinessShiftMealRelationships { get; set; }
}
}
diff --git a/Src/Dlhis.Basic/Dishes/Services/IDishesService.cs b/Src/Dlhis.Basic/Dishes/Services/IDishesService.cs
index 6155d573..3d7338d0 100644
--- a/Src/Dlhis.Basic/Dishes/Services/IDishesService.cs
+++ b/Src/Dlhis.Basic/Dishes/Services/IDishesService.cs
@@ -10,6 +10,6 @@ public interface IDishesService : IScopeDependency
Task SaveDishesAsync(DishesSaveRequest request);
- Task> GetDishesMenusBookingSetting(Guid PLaceCode);
+ Task GetDishesMenusBookingSetting(Guid PLaceCode);
}
diff --git a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs
index f0520772..bda18ed8 100644
--- a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs
+++ b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs
@@ -49,17 +49,20 @@ public class DishesService : IDishesService
}
}
- public async Task> GetDishesMenusBookingSetting(Guid PLaceCode)
+ public async Task GetDishesMenusBookingSetting(Guid PLaceCode)
{
var shift = await _dbContext.Queryable()
.Where(x => x.PlaceCode == PLaceCode)
.FirstAsync();
- var res= await _dbContext.Queryable()
+ var BusinessShiftMealRelationships= await _dbContext.Queryable()
.Where(x => x.ShiftCode == shift.ShiftCode)
- .Select()
+ .Select()
.ToListAsync();
-
+ var res = new GetDishesMenusBookingResponse
+ {
+ BusinessShiftMealRelationships = BusinessShiftMealRelationships,
+ };
return res;
}