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

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

Browse Source
This commit is contained in:
Olga Nemt 2024-03-22 17:15:11 +05:00
parent dde34dad19
commit 8ef37600c7
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AsbCloudApp/Data/ScheduleDto.cs
View File

@ -39,13 +39,13 @@ namespace AsbCloudApp.Data
/// Начало бурения /// Начало бурения
/// </summary> /// </summary>
[Required] [Required]
public DateTime DrillStart { get; set; } public DateTimeOffset DrillStart { get; set; }
/// <summary> /// <summary>
/// Конец бурения /// Конец бурения
/// </summary> /// </summary>
[Required] [Required]
public DateTime DrillEnd { get; set; } public DateTimeOffset DrillEnd { get; set; }
/// <summary> /// <summary>
/// Бурильщик /// Бурильщик

9
AsbCloudInfrastructure/Repository/ScheduleRepository.cs
View File

@ -82,10 +82,9 @@ namespace AsbCloudInfrastructure.Repository
protected override Schedule Convert(ScheduleDto dto) protected override Schedule Convert(ScheduleDto dto)
{ {
var hoursOffset = wellService.GetTimezone(dto.IdWell).Hours;
var entity = base.Convert(dto); var entity = base.Convert(dto);
entity.DrillStart = dto.DrillStart.ToUtcDateTimeOffset(hoursOffset); entity.DrillStart = dto.DrillStart.ToUniversalTime();
entity.DrillEnd = dto.DrillEnd.ToUtcDateTimeOffset(hoursOffset); entity.DrillEnd = dto.DrillEnd.ToUniversalTime();
return entity; return entity;
} }
@ -93,8 +92,8 @@ namespace AsbCloudInfrastructure.Repository
{ {
var hoursOffset = wellService.GetTimezone(entity.IdWell).Hours; var hoursOffset = wellService.GetTimezone(entity.IdWell).Hours;
var dto = base.Convert(entity); var dto = base.Convert(entity);
dto.DrillStart = entity.DrillStart.ToRemoteDateTime(hoursOffset); dto.DrillStart = entity.DrillStart.ToOffset(TimeSpan.FromHours(hoursOffset));
dto.DrillEnd = entity.DrillEnd.ToRemoteDateTime(hoursOffset); dto.DrillEnd = entity.DrillEnd.ToOffset(TimeSpan.FromHours(hoursOffset));
return dto; return dto;
} }
} }

2
AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs
View File

@ -264,7 +264,7 @@ public class DetectedOperationService : IDetectedOperationService
&& v.DepthStart <= dto.DepthStart && v.DepthStart <= dto.DepthStart
&& v.DepthEnd > dto.DepthStart); && v.DepthEnd > dto.DepthStart);
var dateStart = dto.DateStart; var dateStart = dto.DateStart.ToUniversalTime();
var timeStart = new TimeDto(dateStart); var timeStart = new TimeDto(dateStart);
var driller = schedules.FirstOrDefault(s => var driller = schedules.FirstOrDefault(s =>
s.DrillStart <= dateStart && s.DrillStart <= dateStart &&

4
AsbCloudWebApi.Tests/Services/DailyReportServiceTest.cs
View File

@ -178,8 +178,8 @@ public class DailyReportServiceTest
IdWell = idWell, IdWell = idWell,
ShiftStart = new TimeDto(1), ShiftStart = new TimeDto(1),
ShiftEnd = new TimeDto(5), ShiftEnd = new TimeDto(5),
DrillStart = new DateTime(2023, 01, 26), DrillStart = new DateTimeOffset(2023, 01, 26, 0, 0, 0, TimeSpan.Zero),
DrillEnd = new DateTime(2023, 12, 26), DrillEnd = new DateTimeOffset(2023, 12, 26, 0, 0, 0, TimeSpan.Zero),
Driller = new() Driller = new()
{ {
Name = "Иван", Name = "Иван",