From e60fbfdc3a53fc0b304dd4edaff6b3557e47ce6f Mon Sep 17 00:00:00 2001
From: Mikhail Trubnikov <ivc_trubnikovme@dvgd.rzd>
Date: Tue, 27 Jan 2026 16:36:40 +1000
Subject: [PATCH] =?UTF-8?q?feat(api):=20=20=D0=B2=20StatTemplateDistributi?=
 =?UTF-8?q?on=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20query?=
 =?UTF-8?q?=20=D1=81=20=D1=82=D0=B0=D0=B9=D0=BC=D0=B7=D0=BE=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StatTemplateDistributionController.cs           | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/PARR.API/Controllers/V1/Statistics/StatTemplateDistributionController.cs b/PARR.API/Controllers/V1/Statistics/StatTemplateDistributionController.cs
index 8df08c08..d724c613 100644
--- a/PARR.API/Controllers/V1/Statistics/StatTemplateDistributionController.cs
+++ b/PARR.API/Controllers/V1/Statistics/StatTemplateDistributionController.cs
@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using PARR.API.Contracts.V1;
+using PARR.API.Contracts.V1.Requests.BaseRequests;
 using PARR.API.Contracts.V1.Responses;
 using PARR.API.Contracts.V1.Responses.Base;
 using PARR.API.Contracts.V1.Responses.Statistics;
@@ -54,7 +55,7 @@ namespace PARR.API.Controllers.V1.Statistics
         /// <param name="jobGroupId"></param>
         /// <returns></returns>
         [HttpGet(ApiRoutes.StatTemplateDistribution.Get)]
-        public async Task<IActionResult> Get([FromRoute] Guid jobGroupId)
+        public async Task<IActionResult> Get([FromRoute] Guid jobGroupId, [FromQuery] TimeZoneOffsetClient timeZoneQuery)
         {
             // eadc5498-dba6-4f10-9b4b-a1653e3c3e61
 
@@ -113,7 +114,7 @@ namespace PARR.API.Controllers.V1.Statistics
 
                 foreach (var groupedItem in grouped)
                 {
-                    var statResult = GetResponseByWorkGroup(groupedItem.Key, groupedItem.Value, workDays);
+                    var statResult = GetResponseByWorkGroup(groupedItem.Key, groupedItem.Value, workDays, timeZoneQuery.TimeZoneOffsetHours);
                     responseItemsList.Add(statResult);
                 }
             }
@@ -122,7 +123,7 @@ namespace PARR.API.Controllers.V1.Statistics
                 // не нужно группировать по рабочим группам
 
                 // сразу формируем response
-                responseItemsList.Add(GetResponseByWorkGroup(null, items.Select(t => t.Template).ToList(), workDays));
+                responseItemsList.Add(GetResponseByWorkGroup(null, items.Select(t => t.Template).ToList(), workDays, timeZoneQuery.TimeZoneOffsetHours));
             }
 
             var response = new StatTemplateDistributorResponse
@@ -159,7 +160,7 @@ namespace PARR.API.Controllers.V1.Statistics
             return await nextRunService.GetWorkDaysAsync(dateStart, dateEnd, jobGroup.DistributionConfig!.IsExcludeWeekends);
         }
 
-        private StatDistributorItemResponse GetResponseByWorkGroup(string? workGroupName, List<Template> templates, List<DateOnly> workDays)
+        private StatDistributorItemResponse GetResponseByWorkGroup(string? workGroupName, List<Template> templates, List<DateOnly> workDays, int timeZoneOffsetHours)
         {
             var result = new StatDistributorItemResponse
             {
@@ -174,7 +175,9 @@ namespace PARR.API.Controllers.V1.Statistics
                 }).ToList()
             };
 
-            foreach (var templatesFromDate in templates.GroupBy(t => DateOnly.FromDateTime(t.NextRun.Date)))
+            //foreach (var templatesFromDate in templates.GroupBy(t => DateOnly.FromDateTime(t.NextRun.Date)))
+            // смещаем по часовой зоне и группируем по дате
+            foreach (var templatesFromDate in templates.GroupBy(t => DateOnly.FromDateTime(t.NextRun.AddHours(timeZoneOffsetHours).Date)))
             {
                 var statisticsForDate = result.Statistics.FirstOrDefault(t => t.Date == templatesFromDate.Key);
                 if (statisticsForDate == null)