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

debug and fix daily report

Browse Source
This commit is contained in:
ngfrolov 2022-05-05 15:14:29 +05:00
parent 5de01e5b5d
commit 5458ac5414
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,9 +76,12 @@ namespace AsbCloudInfrastructure.Services.DailyReport
public async Task<int> UpdateAsync(int idWell, DateTime date, DailyReportDto dto, CancellationToken token) public async Task<int> UpdateAsync(int idWell, DateTime date, DailyReportDto dto, CancellationToken token)
{ {
var offsetHours = wellService.GetTimezone(idWell).Hours; var offsetHours = wellService.GetTimezone(idWell).Hours;
var reportDateOffset = date.ToUtcDateTimeOffset(offsetHours); var dateOffset = date.ToUtcDateTimeOffset(offsetHours);
var entity = await db.DailyReports var entity = await db.DailyReports
.FirstOrDefaultAsync(r => r.IdWell == idWell && r.StartDate == reportDateOffset, token); .FirstOrDefaultAsync(r => r.IdWell == idWell &&
r.StartDate.Year == dateOffset.Year &&
r.StartDate.DayOfYear == dateOffset.DayOfYear
, token);
if (entity is null) if (entity is null)
return 0; return 0;
@ -104,15 +107,16 @@ namespace AsbCloudInfrastructure.Services.DailyReport
{ {
var offsetHours = wellService.GetTimezone(idWell).Hours; var offsetHours = wellService.GetTimezone(idWell).Hours;
var dateOffset = date.ToUtcDateTimeOffset(offsetHours); var dateOffset = date.ToUtcDateTimeOffset(offsetHours);
var query = db.DailyReports var entity = await db.DailyReports
.Where(r => r.IdWell == idWell) .FirstOrDefaultAsync(r => r.IdWell == idWell &&
.Where(d => d.StartDate == dateOffset); r.StartDate.Year == dateOffset.Year &&
r.StartDate.DayOfYear == dateOffset.DayOfYear
, token);
var data = await query.FirstOrDefaultAsync(token); if (entity is null)
if (data is null)
return null; return null;
else else
return Convert(data, offsetHours); return Convert(entity, offsetHours);
} }
private async Task<DailyReportDto> MakeDefaultDailyReportAsync(int idWell, CancellationToken token) private async Task<DailyReportDto> MakeDefaultDailyReportAsync(int idWell, CancellationToken token)
@ -121,10 +125,9 @@ namespace AsbCloudInfrastructure.Services.DailyReport
var offsetHours = wellService.GetTimezone(idWell).Hours; var offsetHours = wellService.GetTimezone(idWell).Hours;
var dto = new DailyReportDto() var dto = new DailyReportDto()
{ {
ReportDate = DateTimeOffset.UtcNow.ToRemoteDateTime(offsetHours), ReportDate = DateTimeOffset.UtcNow.ToRemoteDateTime(offsetHours).Date,
WellName = well.Caption, WellName = well.Caption,
ClusterName = well.Cluster, ClusterName = well.Cluster,
}; };
DailyReportDto result = dto; DailyReportDto result = dto;
return result; return result;
@ -133,14 +136,17 @@ namespace AsbCloudInfrastructure.Services.DailyReport
private static DailyReportDto Convert(AsbCloudDb.Model.DailyReport entity, double offsetHours) private static DailyReportDto Convert(AsbCloudDb.Model.DailyReport entity, double offsetHours)
{ {
var dto = entity.Info.Adapt<DailyReportDto>(); var dto = entity.Info.Adapt<DailyReportDto>();
dto.ReportDate = entity.StartDate.ToRemoteDateTime(offsetHours); dto.ReportDate = entity.StartDate
.ToRemoteDateTime(offsetHours);
return dto; return dto;
} }
private static DailyReportInfo Convert(DailyReportDto dto, double offsetHours) private static DailyReportInfo Convert(DailyReportDto dto, double offsetHours)
{ {
var entity = dto.Adapt<DailyReportInfo>(); var entity = dto.Adapt<DailyReportInfo>();
entity.ReportDate = dto.ReportDate.ToUtcDateTimeOffset(offsetHours); entity.ReportDate = dto.ReportDate
.ToUtcDateTimeOffset(offsetHours)
.Date;
return entity; return entity;
} }
} }

4
AsbCloudWebApi/Controllers/DailyReportController.cs
View File

@ -101,10 +101,12 @@ namespace AsbCloudWebApi.Controllers
[ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK)] [ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK)]
public async Task<IActionResult> DownloadAsync(int idWell, DateTime date, CancellationToken token = default) public async Task<IActionResult> DownloadAsync(int idWell, DateTime date, CancellationToken token = default)
{ {
var well = await wellService.GetAsync(idWell, token);
var stream = await dailyReportService.MakeReportAsync(idWell, date, token); var stream = await dailyReportService.MakeReportAsync(idWell, date, token);
if (stream != null) if (stream != null)
{ {
var fileName = "CP.xlsx";
var fileName = $"Суточный рапорт по скважине {well.Caption} куст {well.Cluster}.xlsx";
return File(stream, "application/octet-stream", fileName); return File(stream, "application/octet-stream", fileName);
} }
else else