mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(api, esppOrderLoader, esppOrderManager): исправлена часовая зона УЗ ЕСПП

Browse Source
This commit is contained in:
Mikhail Trubnikov
2024-09-04 12:29:49 +10:00
parent 62d84b0a18
commit 2a774bc413
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PARR.API/Controllers/V1/Statistics/StatOrderController.cs
View File

@@ -139,7 +139,7 @@ namespace PARR.API.Controllers.V1.Statistics
var query = orderService.Get() var query = orderService.Get()
.Where(t => .Where(t =>
t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date >= startPeriod.Date 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) ).GroupBy(t => t.DateCreated.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date)
.Select(t => new .Select(t => new
{ {

2
PARR.EsppApi/Settings/EsppUserTimeZoneSettings.cs
View File

@@ -5,6 +5,6 @@
/// <summary> /// <summary>
/// Таймзона учетной записи ЕСПП относительно UTC /// Таймзона учетной записи ЕСПП относительно UTC
/// </summary> /// </summary>
public static int TimeZone = 10;//0; public static int TimeZone { get; set; } = 3;
} }
} }

3
PARR.EsppOrderLoaderWorker/appsettings.json
View File

@@ -36,7 +36,6 @@
"Url": "http://espp.gvc.rzd/esppapi_prom/OperationExecutor/", "Url": "http://espp.gvc.rzd/esppapi_prom/OperationExecutor/",
"UserName": "Auto-PTK-INFO-0002-DVS", "UserName": "Auto-PTK-INFO-0002-DVS",
"Password": "123456789", "Password": "123456789",
//"EsppUserTimeZone": 10 "EsppUserTimeZone": 3
"EsppUserTimeZone": 0
} }
} }

2
PARR.EsppOrderManagerWorker/appsettings.json
View File

@@ -40,7 +40,7 @@
"UserName": "Auto-PTK-INFO-0002-DVS", "UserName": "Auto-PTK-INFO-0002-DVS",
"AccountName": "АВТО ТЕХНОЛОГ ПТК-ИНФО-0002-ДВС (AUTO-PTK-INFO-0002-DVS)", "AccountName": "АВТО ТЕХНОЛОГ ПТК-ИНФО-0002-ДВС (AUTO-PTK-INFO-0002-DVS)",
"Password": "123456789", "Password": "123456789",
"EsppUserTimeZone": 10, "EsppUserTimeZone": 3,
"RobotEk": "РПА-РОБИН-ГВЦ-ЕСПП-ТС-513-ДВС", "RobotEk": "РПА-РОБИН-ГВЦ-ЕСПП-ТС-513-ДВС",
"CodeRRO": "ЦТС-РЦТ-9999" "CodeRRO": "ЦТС-РЦТ-9999"
}, },

2
PARR.Test/appsettings.json
View File

@@ -33,7 +33,7 @@
"UserName": "Auto-PTK-INFO-0002-DVS", "UserName": "Auto-PTK-INFO-0002-DVS",
"AccountName": "АВТО ТЕХНОЛОГ ПТК-ИНФО-0002-ДВС (AUTO-PTK-INFO-0002-DVS)", "AccountName": "АВТО ТЕХНОЛОГ ПТК-ИНФО-0002-ДВС (AUTO-PTK-INFO-0002-DVS)",
"Password": "123456789", "Password": "123456789",
"EsppUserTimeZone": 10, "EsppUserTimeZone": 3,
"RobotEk": "РПА-РОБИН-ГВЦ-ЕСПП-ТС-513-ДВС", "RobotEk": "РПА-РОБИН-ГВЦ-ЕСПП-ТС-513-ДВС",
"CodeRRO": "ЦТС-РЦТ-9999" "CodeRRO": "ЦТС-РЦТ-9999"
} }