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

Фиксы

Browse Source
This commit is contained in:
Степанов Дмитрий 2023-11-15 09:43:13 +05:00
parent 23e8615e8a
commit 491d9d4abe
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationExportService.cs
View File

@ -163,12 +163,12 @@ public class DetectedOperationExportService
{ {
DateTime = d.DateTime, DateTime = d.DateTime,
IdUser = d.IdUser, IdUser = d.IdUser,
WellDepth = d.WellDepth ?? float.NaN, WellDepth = d.WellDepth,
Pressure = d.Pressure ?? float.NaN, Pressure = d.Pressure,
HookWeight = d.HookWeight ?? float.NaN, HookWeight = d.HookWeight,
BlockPosition = d.BlockPosition ?? float.NaN, BlockPosition = d.BlockPosition,
BitDepth = d.BitDepth ?? float.NaN, BitDepth = d.BitDepth,
RotorSpeed = d.RotorSpeed ?? float.NaN, RotorSpeed = d.RotorSpeed,
}) })
.OrderBy(d => d.DateTime); .OrderBy(d => d.DateTime);

3
AsbCloudWebApi/Controllers/SAUB/DetectedOperationController.cs
View File

@ -123,12 +123,13 @@ namespace AsbCloudWebApi.Controllers.SAUB
/// </summary> /// </summary>
/// <param name="idWell">id скважины</param> /// <param name="idWell">id скважины</param>
/// <param name="idDomain">Идентификатор домена</param> /// <param name="idDomain">Идентификатор домена</param>
/// <param name="token"></param>
[HttpGet("export")] [HttpGet("export")]
[Permission] [Permission]
[ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK, "application/octet-stream")] [ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK, "application/octet-stream")]
[ProducesResponseType(StatusCodes.Status204NoContent)] [ProducesResponseType(StatusCodes.Status204NoContent)]
[ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)] [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
public async Task<IActionResult> ExportAsync(int idWell, [Range(1, 2)]int idDomain, CancellationToken token) public async Task<IActionResult> ExportAsync(int idWell, [Range(1, 2)] int idDomain, CancellationToken token)
{ {
var idCompany = User.GetCompanyId(); var idCompany = User.GetCompanyId();