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

1. Убраны лишние юзинги + лишняя проверка на null

Browse Source 
2. Поправлен шаблон документа для выгрузки данных
This commit is contained in:
Olga Nemt 2023-02-08 15:46:16 +05:00
parent d83555fd46
commit 8c579fe5b7
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs
View File

@ -13,7 +13,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMap
public class ProcessMapReportService : IProcessMapReportService public class ProcessMapReportService : IProcessMapReportService
{ {
const int firstColumn = 2; const int firstColumn = 2;
const int lastColumn = 30; const int lastColumn = 61;
const int headerRowsCount = 8; const int headerRowsCount = 8;
@ -122,7 +122,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMap
int columnSpeed = columnTorque + 5; int columnSpeed = columnTorque + 5;
int columnUsagePlan = columnSpeed + 5; int columnUsagePlan = columnSpeed + 5;
int columnUsageFact = columnUsagePlan + 1; int columnUsageFact = columnUsagePlan + 1;
int columnRop = columnUsageFact + 1; int columnRop = columnUsageFact + 12;
sheet.Cell(row, column) sheet.Cell(row, column)
.SetVal(modeName); .SetVal(modeName);

BIN
AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportTemplate.xlsx
View File

Binary file not shown.

9
AsbCloudWebApi/Controllers/ProcessMapController.cs
View File

@ -1,7 +1,5 @@
using AsbCloudApp.Data.ProcessMap; using AsbCloudApp.Data.ProcessMap;
using AsbCloudApp.Services; using AsbCloudApp.Services;
using AsbCloudDb.Model;
using AsbCloudInfrastructure.Services.ProcessMap;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using System; using System;
@ -124,12 +122,7 @@ namespace AsbCloudWebApi.Controllers
public async Task<IActionResult> GetDrillProcessMap(int wellId, CancellationToken token) public async Task<IActionResult> GetDrillProcessMap(int wellId, CancellationToken token)
{ {
var data = await processMapService.GetProcessMapAsync(wellId, token); var data = await processMapService.GetProcessMapAsync(wellId, token);
if (data != null) return Ok(data);
{
return Ok(data);
}
else
return NoContent();
} }
/// <summary> /// <summary>