fix 时间字段映射
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
using Dlhis.Basic.WorkGrids.Request;
|
using Dlhis.Basic.WorkGrids.Request;
|
||||||
using Dlhis.Basic.WorkGrids.Response;
|
using Dlhis.Basic.WorkGrids.Response;
|
||||||
using Dlhis.Basic.WorkGrids.Services;
|
using Dlhis.Basic.WorkGrids.Services;
|
||||||
|
using Kurisu.AspNetCore.CustomClass;
|
||||||
using Kurisu.AspNetCore.DataAccess.Dto;
|
using Kurisu.AspNetCore.DataAccess.Dto;
|
||||||
using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
|
using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
|
||||||
using Microsoft.AspNetCore.Authorization;
|
using Microsoft.AspNetCore.Authorization;
|
||||||
@@ -133,22 +134,23 @@ public class WorkGridsController : ControllerBase
|
|||||||
/// <param name="date"></param>
|
/// <param name="date"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet("user/schedule/list")]
|
[HttpGet("user/schedule/list")]
|
||||||
public async Task<List<WorkGridScheduleResponse>> GetListAsync([FromQuery] Guid workGridCode, [FromQuery] DateOnly date)
|
public async Task<List<WorkGridScheduleResponse>> 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));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取网格人员排班详情
|
/// 获取网格人员排班详情
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="workGridCode">网格</param>
|
/// <param name="workGridCode">网格</param>
|
||||||
/// <param name="start">开始日期</param>
|
/// <param name="datePeriod"></param>
|
||||||
/// <param name="end">结束日期</param>
|
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet("user/schedule/summary")]
|
[HttpGet("user/schedule/summary")]
|
||||||
public async Task<IEnumerable<WorkGridScheduleSummaryResponse>> GetListSummaryAsync([FromQuery] Guid workGridCode, [FromQuery] DateOnly start, [FromQuery] DateOnly end)
|
public async Task<IEnumerable<WorkGridScheduleSummaryResponse>> 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));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
Reference in New Issue
Block a user