diff --git a/Src/Dlhis.Basic/WorkGrids/Controllers/WorkGridsController.cs b/Src/Dlhis.Basic/WorkGrids/Controllers/WorkGridsController.cs
index 7504ca30..d70e7666 100644
--- a/Src/Dlhis.Basic/WorkGrids/Controllers/WorkGridsController.cs
+++ b/Src/Dlhis.Basic/WorkGrids/Controllers/WorkGridsController.cs
@@ -1,6 +1,7 @@
using Dlhis.Basic.WorkGrids.Request;
using Dlhis.Basic.WorkGrids.Response;
using Dlhis.Basic.WorkGrids.Services;
+using Kurisu.AspNetCore.CustomClass;
using Kurisu.AspNetCore.DataAccess.Dto;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
using Microsoft.AspNetCore.Authorization;
@@ -134,22 +135,23 @@ public class WorkGridsController : ControllerBase
///
///
[HttpGet("user/schedule/list")]
- public async Task> GetListAsync([FromQuery] Guid workGridCode, [FromQuery] DateOnly date)
+ public async Task> GetListAsync([FromQuery] Guid workGridCode, [FromQuery] DateTime date)
{
- return await _workGridScheduleService.GetListAsync(workGridCode, date);
+ return await _workGridScheduleService.GetListAsync(workGridCode, new DateOnly(date.Year, date.Month, date.Day));
}
///
/// 获取网格人员排班详情
///
/// 网格
- /// 开始日期
- /// 结束日期
+ ///
///
[HttpGet("user/schedule/summary")]
- public async Task> GetListSummaryAsync([FromQuery] Guid workGridCode, [FromQuery] DateOnly start, [FromQuery] DateOnly end)
+ public async Task> GetListSummaryAsync([FromQuery] Guid workGridCode, [FromQuery] DateTimePeriod datePeriod)
{
- return await _workGridScheduleService.GetListSummaryAsync(workGridCode, start, end);
+ var start = datePeriod.Start!.Value;
+ var end = datePeriod.End!.Value;
+ return await _workGridScheduleService.GetListSummaryAsync(workGridCode, new DateOnly(start.Year, start.Month, start.Day), new DateOnly(end.Year, end.Month, end.Day));
}
///