forked from ddrilling/AsbCloudServer
Фикс суточного шаблона
This commit is contained in:
parent
801c4b8c49
commit
8192a41d19
@ -64,10 +64,12 @@ public class DailyReportRepository : CrudRepositoryBase<DailyReportDto, DailyRep
|
|||||||
.AsNoTracking()
|
.AsNoTracking()
|
||||||
.SingleOrDefaultAsync(d => d.IdWell == idWell && d.Date == date, cancellationToken);
|
.SingleOrDefaultAsync(d => d.IdWell == idWell && d.Date == date, cancellationToken);
|
||||||
|
|
||||||
return entity is null ? null : Convert(entity);
|
var timezoneOffset = wellService.GetTimezone(idWell).Offset;
|
||||||
|
|
||||||
|
return entity is null ? null : Convert(entity, timezoneOffset);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected DailyReportDto Convert(DailyReport src, TimeSpan timezoneOffset)
|
private static DailyReportDto Convert(DailyReport src, TimeSpan timezoneOffset)
|
||||||
{
|
{
|
||||||
var dto = new DailyReportDto
|
var dto = new DailyReportDto
|
||||||
{
|
{
|
||||||
|
@ -185,11 +185,11 @@ public class DailyReportExportService : IDailyReportExportService
|
|||||||
sheet.Cell(rowСurrent, columnSubsystemName).SetCellValue(subsystem.Name);
|
sheet.Cell(rowСurrent, columnSubsystemName).SetCellValue(subsystem.Name);
|
||||||
sheet.Cell(rowСurrent, columnUseSubsystemPerDayUsedTimeHours).SetCellValue(subsystem.UsagePerDay?.UsedTimeHours);
|
sheet.Cell(rowСurrent, columnUseSubsystemPerDayUsedTimeHours).SetCellValue(subsystem.UsagePerDay?.UsedTimeHours);
|
||||||
sheet.Cell(rowСurrent, columnUseSubsystemPerDaySumDepthInterval).SetCellValue(subsystem.UsagePerDay?.SumDepthInterval);
|
sheet.Cell(rowСurrent, columnUseSubsystemPerDaySumDepthInterval).SetCellValue(subsystem.UsagePerDay?.SumDepthInterval);
|
||||||
sheet.Cell(rowСurrent, columnUseSubsystemPerDayKUsage).SetCellValue(subsystem.UsagePerDay?.KUsage);
|
sheet.Cell(rowСurrent, columnUseSubsystemPerDayKUsage).SetCellValue(subsystem.UsagePerDay?.KUsage * 100);
|
||||||
|
|
||||||
sheet.Cell(rowСurrent, columnUseSubsystemPerWellUsedTimeHours).SetCellValue(subsystem.UsagePerWell?.UsedTimeHours);
|
sheet.Cell(rowСurrent, columnUseSubsystemPerWellUsedTimeHours).SetCellValue(subsystem.UsagePerWell?.UsedTimeHours);
|
||||||
sheet.Cell(rowСurrent, columnUseSubsystemPerWellSumDepthInterval).SetCellValue(subsystem.UsagePerWell?.SumDepthInterval);
|
sheet.Cell(rowСurrent, columnUseSubsystemPerWellSumDepthInterval).SetCellValue(subsystem.UsagePerWell?.SumDepthInterval);
|
||||||
sheet.Cell(rowСurrent, columnUseSubsystemPerWellKUsage).SetCellValue(subsystem.UsagePerWell?.KUsage);
|
sheet.Cell(rowСurrent, columnUseSubsystemPerWellKUsage).SetCellValue(subsystem.UsagePerWell?.KUsage * 100);
|
||||||
|
|
||||||
rowСurrent++;
|
rowСurrent++;
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user