feat 网格二期补充

This commit is contained in:
2025-07-08 15:49:35 +08:00
parent 53d46cee0c
commit 90f90e33d4
17 changed files with 330 additions and 108 deletions

View File

@@ -5,7 +5,6 @@ using Dlhis.Entity.Basic.Enums;
using Kurisu.AspNetCore.CustomClass;
using Kurisu.AspNetCore.DataAccess.Dto;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
using Kurisu.AspNetCore.UnifyResultAndValidation;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
@@ -40,7 +39,7 @@ public class WorkGridsController : ControllerBase
[HttpGet("gainfo-selections")]
public async Task<Pagination<WorkGridGainfoPageResponse>> GetPageAsync([FromQuery] WorkGridGainfoPageRequest request)
{
return await _workGridService.GetPageAsync(request);
return await _workGridService.GetUserSelectionPageAsync(request);
}
@@ -57,7 +56,7 @@ public class WorkGridsController : ControllerBase
}
/// <summary>
/// /网格分页
/// 网格分页
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
@@ -174,11 +173,16 @@ public class WorkGridsController : ControllerBase
/// <param name="datePeriod"></param>
/// <returns></returns>
[HttpGet("user/schedule/summary")]
public async Task<IEnumerable<WorkGridScheduleSummaryResponse>> GetListSummaryAsync([FromQuery] Guid workGridCode, [FromQuery] DateTimePeriod datePeriod)
public async Task<List<WorkGridScheduleSummaryResponse>> GetListSummaryAsync([FromQuery] Guid workGridCode, [FromQuery] DateTimePeriod datePeriod)
{
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));
return await _workGridScheduleService.GetListSummaryAsync(workGridCode, datePeriod);
}
[HttpPost("user/schedule/cancel")]
[Transactional]
public async Task ManuallyCancelAsync(WorkGridScheduleCancelRequest request)
{
await _workGridScheduleService.ManuallyCancelAsync(request.Id, request.Reason);
}
/// <summary>