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

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

Browse Source
This commit is contained in:
Olga Nemt 2024-03-22 17:59:03 +05:00
parent 86674ba263
commit 72341e76d2
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsbCloudApp/Data/ProcessMaps/Report/ProcessMapReportDataSaubStatDto.cs
View File

@ -44,7 +44,7 @@ public class ProcessMapReportDataSaubStatDto
/// на начало интервала /// на начало интервала
/// </para> /// </para>
/// </summary> /// </summary>
public DateTime DateStart { get; set; } public DateTimeOffset DateStart { get; set; }
/// <summary> /// <summary>
/// Режим бурения (Ротор/слайд/ручной) /// Режим бурения (Ротор/слайд/ручной)

10
AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs
View File

@ -106,8 +106,9 @@ public class DailyReportService : IDailyReportService
IdWell = well.Id IdWell = well.Id
}; };
var geDate = dailyReport.Date.ToDateTime(TimeOnly.MinValue, DateTimeKind.Unspecified); var offsetHours = wellService.GetTimezone(dailyReport.IdWell).Hours;
var ltDate = dailyReport.Date.AddDays(1).ToDateTime(TimeOnly.MinValue, DateTimeKind.Unspecified); var geDate = new DateTimeOffset(dailyReport.Date, TimeOnly.MinValue, TimeSpan.FromHours(offsetHours));
var ltDate = new DateTimeOffset(dailyReport.Date.AddDays(1), TimeOnly.MinValue, TimeSpan.FromHours(offsetHours));
var factOperationRequest = new WellOperationRequest var factOperationRequest = new WellOperationRequest
{ {
@ -369,8 +370,9 @@ public class DailyReportService : IDailyReportService
private async Task AddProcessMapWellDrillingBlockAsync(DailyReportDto dailyReport, CancellationToken cancellationToken) private async Task AddProcessMapWellDrillingBlockAsync(DailyReportDto dailyReport, CancellationToken cancellationToken)
{ {
var geDate = dailyReport.Date.ToDateTime(TimeOnly.MinValue, DateTimeKind.Unspecified); var offsetHours = wellService.GetTimezone(dailyReport.IdWell).Hours;
var leDate = dailyReport.Date.AddDays(1).ToDateTime(TimeOnly.MinValue, DateTimeKind.Unspecified); var geDate = new DateTimeOffset(dailyReport.Date, TimeOnly.MinValue, TimeSpan.FromHours(offsetHours));
var leDate = new DateTimeOffset(dailyReport.Date.AddDays(1), TimeOnly.MinValue, TimeSpan.FromHours(offsetHours));
var request = new DataSaubStatRequest(); var request = new DataSaubStatRequest();
dailyReport.ProcessMapWellDrillingBlock = (await processMapReportDrillingService.GetAsync(dailyReport.IdWell, request, dailyReport.ProcessMapWellDrillingBlock = (await processMapReportDrillingService.GetAsync(dailyReport.IdWell, request,

2
AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportDrillingService.cs
View File

@ -174,7 +174,7 @@ public class ProcessMapReportDrillingService : IProcessMapReportDrillingService
var result = new ProcessMapReportDataSaubStatDto() var result = new ProcessMapReportDataSaubStatDto()
{ {
IdWellSectionType = wellSectionType.Id, IdWellSectionType = wellSectionType.Id,
DateStart = firstElemInInterval.DateStart.DateTime, DateStart = firstElemInInterval.DateStart,
WellSectionTypeName = wellSectionType.Caption, WellSectionTypeName = wellSectionType.Caption,
DepthStart = firstElemInInterval.DepthStart, DepthStart = firstElemInInterval.DepthStart,
DepthEnd = lastElemInInterval.DepthEnd, DepthEnd = lastElemInInterval.DepthEnd,

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

@ -113,7 +113,7 @@ public class DailyReportServiceTest
private readonly ProcessMapReportDataSaubStatDto fakeProcessMapReportWellDrilling = new() private readonly ProcessMapReportDataSaubStatDto fakeProcessMapReportWellDrilling = new()
{ {
DrillingMode = "Ротор", DrillingMode = "Ротор",
DateStart = new DateTime(2023, 10, 26), DateStart = new DateTimeOffset(2023, 10, 26, 0, 0, 0, TimeSpan.Zero),
DeltaDepth = 500, DeltaDepth = 500,
Rop = new PlanFactDto<double?> Rop = new PlanFactDto<double?>
{ {