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

Merge branch 'dev' into feature/well_operations_import

Browse Source
This commit is contained in:
ngfrolov 2023-09-06 17:19:21 +05:00
commit b277e47785
Signed by: ng.frolov
GPG Key ID: E99907A0357B29A7
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
AsbCloudInfrastructure/Services/AutoGeneratedDailyReports/AutoGeneratedDailyReportService.cs
View File

@ -66,8 +66,6 @@ public class AutoGeneratedDailyReportService : IAutoGeneratedDailyReportService
if (datesRange is null) if (datesRange is null)
return result; return result;
result.Count = (int)(Math.Ceiling((datesRange.To - DateTime.UnixEpoch).TotalDays) - Math.Floor((datesRange.From - DateTime.UnixEpoch).TotalDays));
if (request.StartDate.HasValue) if (request.StartDate.HasValue)
{ {
@ -87,6 +85,9 @@ public class AutoGeneratedDailyReportService : IAutoGeneratedDailyReportService
datesRange.To = finishDate; datesRange.To = finishDate;
} }
if (datesRange.From.AddDays(result.Skip) <= datesRange.To)
result.Count = (int)(Math.Ceiling((datesRange.To - DateTime.UnixEpoch).TotalDays) - Math.Floor((datesRange.From - DateTime.UnixEpoch).TotalDays));
for (int day = result.Skip; (day - result.Skip) < result.Take && (datesRange.From.AddDays(day)) <= datesRange.To; day++) for (int day = result.Skip; (day - result.Skip) < result.Take && (datesRange.From.AddDays(day)) <= datesRange.To; day++)
{ {
var reportDate = DateOnly.FromDateTime(datesRange.From.AddDays(day)); var reportDate = DateOnly.FromDateTime(datesRange.From.AddDays(day));
@ -149,8 +150,8 @@ public class AutoGeneratedDailyReportService : IAutoGeneratedDailyReportService
return new DatesRangeDto return new DatesRangeDto
{ {
From = factOperations.Min(o => o.DateStart), From = factOperations.Min(o => o.DateStart).Date,
To = factOperations.Max(o => o.DateStart) To = factOperations.Max(o => o.DateStart).Date
}; };
} }

27
AsbCloudInfrastructure/Services/WellContactService.cs
View File

@ -29,18 +29,21 @@ namespace AsbCloudInfrastructure.Services
{ {
Caption = c.Caption, Caption = c.Caption,
Id = c.Id, Id = c.Id,
Users = c.Users.Select(u => new UserContactDto() Users = c.Users
{ .Where(u => u.IdState == 1)
Id = u.Id, .OrderBy(u => u.Surname)
Name = u.Name, .Select(u => new UserContactDto()
Patronymic = u.Patronymic, {
Surname = u.Surname, Id = u.Id,
Company = u.Company.Adapt<CompanyDto>(), Name = u.Name,
Email = u.Email, Patronymic = u.Patronymic,
Phone = u.Phone, Surname = u.Surname,
Position = u.Position, Company = u.Company.Adapt<CompanyDto>(),
IsContact = u.RelationContactsWells.Any(rel => rel.IdWell == wellId) Email = u.Email,
}) Phone = u.Phone,
Position = u.Position,
IsContact = u.RelationContactsWells.Any(rel => rel.IdWell == wellId)
})
}); });
var entities = await query.AsNoTracking() var entities = await query.AsNoTracking()