forked from ddrilling/AsbCloudServer
Фикс репозитория и метода расширения
This commit is contained in:
parent
e409bd4405
commit
0334d5f42e
@ -528,7 +528,7 @@ public class WellOperationRepository : IWellOperationRepository
|
|||||||
.Min(subOp => subOp.DateStart))
|
.Min(subOp => subOp.DateStart))
|
||||||
.TotalDays,
|
.TotalDays,
|
||||||
IdUser = o.IdUser,
|
IdUser = o.IdUser,
|
||||||
LastUpdateDate = DateTime.SpecifyKind(o.LastUpdateDate.UtcDateTime + timeZoneOffset, DateTimeKind.Unspecified)
|
LastUpdateDate = o.LastUpdateDate.ToOffset(TimeSpan.FromHours(timezone.Hours))
|
||||||
});
|
});
|
||||||
|
|
||||||
if (request.SortFields?.Any() == true)
|
if (request.SortFields?.Any() == true)
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using AsbCloudInfrastructure.Services.DailyReport;
|
|
||||||
|
|
||||||
namespace AsbCloudInfrastructure;
|
namespace AsbCloudInfrastructure;
|
||||||
|
|
||||||
@ -197,7 +196,7 @@ internal static class XLExtentions
|
|||||||
return (T)Convert.ChangeType(cell.GetFormattedString(), typeof(T), CultureInfo.InvariantCulture);
|
return (T)Convert.ChangeType(cell.GetFormattedString(), typeof(T), CultureInfo.InvariantCulture);
|
||||||
|
|
||||||
if (cell.Value is DateTime dateTime)
|
if (cell.Value is DateTime dateTime)
|
||||||
return (T)(object)dateTime;
|
return (T)(object)DateTime.SpecifyKind(dateTime, DateTimeKind.Unspecified);
|
||||||
|
|
||||||
return (T)(object)DateTime.FromOADate((double)cell.Value);
|
return (T)(object)DateTime.FromOADate((double)cell.Value);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user