on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Смена типов дат для LimitingParameterDataDto

Browse Source
This commit is contained in:
Olga Nemt 2024-03-22 11:01:12 +05:00
parent 820e383e5b
commit d78209fa0b
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AsbCloudApp/Data/LimitingParameterDataDto.cs
View File

@ -20,12 +20,12 @@ namespace AsbCloudApp.Data
/// <summary> /// <summary>
/// Дата начала ограничения /// Дата начала ограничения
/// </summary> /// </summary>
public DateTime DateStart { get; set; } public DateTimeOffset DateStart { get; set; }
/// <summary> /// <summary>
/// Дата окончания ограничения /// Дата окончания ограничения
/// </summary> /// </summary>
public DateTime DateEnd { get; set; } public DateTimeOffset DateEnd { get; set; }
/// <summary> /// <summary>
/// Глубина начала ограничения /// Глубина начала ограничения

4
AsbCloudApp/Requests/LimitingParameterRequest.cs
View File

@ -17,12 +17,12 @@ namespace AsbCloudApp.Requests
/// <summary> /// <summary>
/// Больше или равно дате /// Больше или равно дате
/// </summary> /// </summary>
public DateTime? GtDate { get; set; } public DateTimeOffset? GtDate { get; set; }
/// <summary> /// <summary>
/// Меньше или равно дате /// Меньше или равно дате
/// </summary> /// </summary>
public DateTime? LtDate { get; set; } public DateTimeOffset? LtDate { get; set; }
/// <summary> /// <summary>
/// Больше или равно глубины забоя /// Больше или равно глубины забоя

8
AsbCloudInfrastructure/Repository/LimitingParameterRepository.cs
View File

@ -39,8 +39,8 @@ namespace AsbCloudInfrastructure.Repository
IdWell = request.IdWell, IdWell = request.IdWell,
IdTelemetry = x.IdTelemetry, IdTelemetry = x.IdTelemetry,
IdFeedRegulator = x.IdFeedRegulator, IdFeedRegulator = x.IdFeedRegulator,
DateStart = DateTime.SpecifyKind(x.DateStart.UtcDateTime + timezoneSpan, DateTimeKind.Unspecified), DateStart = x.DateStart.ToOffset(timezoneSpan),
DateEnd = DateTime.SpecifyKind(x.DateEnd.UtcDateTime + timezoneSpan, DateTimeKind.Unspecified), DateEnd = x.DateEnd.ToOffset(timezoneSpan),
DepthStart = x.DepthStart, DepthStart = x.DepthStart,
DepthEnd = x.DepthEnd DepthEnd = x.DepthEnd
}); });
@ -56,13 +56,13 @@ namespace AsbCloudInfrastructure.Repository
if (request.GtDate.HasValue) if (request.GtDate.HasValue)
{ {
var gtDate = request.GtDate.Value.ToUtcDateTimeOffset(timezoneHours); var gtDate = request.GtDate.Value.ToUniversalTime();
query = query.Where(x => x.DateEnd >= gtDate); query = query.Where(x => x.DateEnd >= gtDate);
} }
if (request.LtDate.HasValue) if (request.LtDate.HasValue)
{ {
var ltDate = request.LtDate.Value.ToUtcDateTimeOffset(timezoneHours); var ltDate = request.LtDate.Value.ToUniversalTime();
query = query.Where(x => x.DateStart <= ltDate); query = query.Where(x => x.DateStart <= ltDate);
} }

2
AsbCloudInfrastructure/Services/LimitingParameterService.cs
View File

@ -106,7 +106,7 @@ namespace AsbCloudInfrastructure.Services
return (float)result; return (float)result;
} }
private DateTime GetDate(double depth, LimitingParameterDataDto dto) private DateTimeOffset GetDate(double depth, LimitingParameterDataDto dto)
{ {
var a = depth - dto.DepthStart; var a = depth - dto.DepthStart;
var b = dto.DepthEnd - dto.DepthStart; var b = dto.DepthEnd - dto.DepthStart;