diff --git a/PARR.API/Contracts/V1/Responses/Statistics/StatOrderResponse.cs b/PARR.API/Contracts/V1/Responses/Statistics/StatOrderResponse.cs index 61163b31..244ece0f 100644 --- a/PARR.API/Contracts/V1/Responses/Statistics/StatOrderResponse.cs +++ b/PARR.API/Contracts/V1/Responses/Statistics/StatOrderResponse.cs @@ -14,9 +14,15 @@ public OrderStatusResponse? Status { get; set; } } - public class GetStatusesLastDayResponse + public class StatGetStatusesLastDayResponse { public int Count { get; set; } public OrderStatusResponse? Status { get; set; } } + + public class StatTaskToEsppResponse + { + public int AllCount { get; set; } + public int TaskCount { get; set; } + } } diff --git a/PARR.API/Controllers/V1/Statistics/StatOrderController.cs b/PARR.API/Controllers/V1/Statistics/StatOrderController.cs index f5f97c0c..ed33b830 100644 --- a/PARR.API/Controllers/V1/Statistics/StatOrderController.cs +++ b/PARR.API/Controllers/V1/Statistics/StatOrderController.cs @@ -59,12 +59,14 @@ namespace PARR.API.Controllers.V1.Statistics [HttpGet(ApiRoutes.StatOrder.TaskToEspp)] public async Task TaskToEspp() { - //todo:!!! + var response = new StatTaskToEsppResponse + { + AllCount = await orderService.Get().CountAsync(), + // такая же логика в PARR.Master + TaskCount = await orderService.Get().CountAsync(t => t.NextStatusCode.HasValue && t.NextStatusCode.Value != t.StatusCode) + }; - //todo: updateDateMOdified - - - return Ok(); + return Ok(new Response(response, true)); } @@ -107,13 +109,13 @@ namespace PARR.API.Controllers.V1.Statistics var queryDate = DateTimeOffset.UtcNow.AddDays(-1); - var response = new GetStatusesLastDayResponse + var response = new StatGetStatusesLastDayResponse { Count = await orderService.Get().CountAsync(t => t.DateModified >= queryDate && t.StatusCode == statusCode), Status = mapper.Map(status) }; - return Ok(new Response(response, true)); + return Ok(new Response(response, true)); }