diff --git a/PARR.API/Controllers/V1/Statistics/StatOrderController.cs b/PARR.API/Controllers/V1/Statistics/StatOrderController.cs index a41c0e05..fc156d12 100644 --- a/PARR.API/Controllers/V1/Statistics/StatOrderController.cs +++ b/PARR.API/Controllers/V1/Statistics/StatOrderController.cs @@ -139,7 +139,7 @@ namespace PARR.API.Controllers.V1.Statistics var query = orderService.Get() .Where(t => t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date >= startPeriod.Date - && t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours) <= endPeriod.Date + && t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date <= endPeriod.Date ).GroupBy(t => t.DateCreated.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date) .Select(t => new { diff --git a/PARR.EsppApi/Settings/EsppUserTimeZoneSettings.cs b/PARR.EsppApi/Settings/EsppUserTimeZoneSettings.cs index abbe6641..b3f6f4ca 100644 --- a/PARR.EsppApi/Settings/EsppUserTimeZoneSettings.cs +++ b/PARR.EsppApi/Settings/EsppUserTimeZoneSettings.cs @@ -5,6 +5,6 @@ /// /// Таймзона учетной записи ЕСПП относительно UTC /// - public static int TimeZone = 10;//0; + public static int TimeZone { get; set; } = 3; } } diff --git a/PARR.EsppOrderLoaderWorker/appsettings.json b/PARR.EsppOrderLoaderWorker/appsettings.json index 46ec0df9..0a507846 100644 --- a/PARR.EsppOrderLoaderWorker/appsettings.json +++ b/PARR.EsppOrderLoaderWorker/appsettings.json @@ -36,7 +36,6 @@ "Url": "http://espp.gvc.rzd/esppapi_prom/OperationExecutor/", "UserName": "Auto-PTK-INFO-0002-DVS", "Password": "123456789", - //"EsppUserTimeZone": 10 - "EsppUserTimeZone": 0 + "EsppUserTimeZone": 3 } } diff --git a/PARR.EsppOrderManagerWorker/appsettings.json b/PARR.EsppOrderManagerWorker/appsettings.json index 844d91bb..adabc829 100644 --- a/PARR.EsppOrderManagerWorker/appsettings.json +++ b/PARR.EsppOrderManagerWorker/appsettings.json @@ -40,7 +40,7 @@ "UserName": "Auto-PTK-INFO-0002-DVS", "AccountName": "АВТО ТЕХНОЛОГ ПТК-ИНФО-0002-ДВС (AUTO-PTK-INFO-0002-DVS)", "Password": "123456789", - "EsppUserTimeZone": 10, + "EsppUserTimeZone": 3, "RobotEk": "РПА-РОБИН-ГВЦ-ЕСПП-ТС-513-ДВС", "CodeRRO": "ЦТС-РЦТ-9999" }, diff --git a/PARR.Test/appsettings.json b/PARR.Test/appsettings.json index 1ca326b2..b0c9fb4d 100644 --- a/PARR.Test/appsettings.json +++ b/PARR.Test/appsettings.json @@ -33,7 +33,7 @@ "UserName": "Auto-PTK-INFO-0002-DVS", "AccountName": "АВТО ТЕХНОЛОГ ПТК-ИНФО-0002-ДВС (AUTO-PTK-INFO-0002-DVS)", "Password": "123456789", - "EsppUserTimeZone": 10, + "EsppUserTimeZone": 3, "RobotEk": "РПА-РОБИН-ГВЦ-ЕСПП-ТС-513-ДВС", "CodeRRO": "ЦТС-РЦТ-9999" }