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

Правки по ревью

Browse Source
This commit is contained in:
Olga Nemt 2023-06-06 15:13:44 +05:00
parent 3163574746
commit e3b574d69d
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AsbCloudApp/Data/WellOperationDto.cs
View File

@ -34,6 +34,7 @@ namespace AsbCloudApp.Data
/// id категории операции /// id категории операции
/// </summary> /// </summary>
[Required] [Required]
[Range(5000, int.MaxValue)]
public int IdCategory { get; set; } public int IdCategory { get; set; }
/// <summary> /// <summary>

5
AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportService.cs
View File

@ -45,6 +45,7 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
if (categories is null) if (categories is null)
{ {
categories = db.WellOperationCategories categories = db.WellOperationCategories
.Where(c => c.Id >= 5000)
.AsNoTracking() .AsNoTracking()
.ToList(); .ToList();
} }
@ -298,8 +299,8 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
if (vCategory is string categoryName) if (vCategory is string categoryName)
{ {
var category = Categories.Find(c => c.Name.ToLower() == categoryName.ToLower()); var category = Categories.Find(c => c.Name.ToLower() == categoryName.ToLower());
if (category is null || category.Id < 5000) if (category is null)
throw new FileFormatException($"Лист {row.Worksheet.Name}. Строка {row.RowNumber()} указана некорректная категория операции"); throw new FileFormatException($"Лист {row.Worksheet.Name}. Строка {row.RowNumber()} указана некорректная категория операции ({categoryName})");
operation.IdCategory = category.Id; operation.IdCategory = category.Id;
operation.CategoryName = category.Name; operation.CategoryName = category.Name;

3
AsbCloudWebApi/Controllers/WellOperationController.cs
View File

@ -244,9 +244,6 @@ namespace AsbCloudWebApi.Controllers
if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false)) if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
return Forbid(); return Forbid();
if (value.IdCategory < 5000)
throw new ArgumentInvalidException($"Выбрана некорректная категория скважины", nameof(value.IdCategory));
value.IdWell = idWell; value.IdWell = idWell;
value.Id = idOperation; value.Id = idOperation;
value.LastUpdateDate = DateTimeOffset.UtcNow; value.LastUpdateDate = DateTimeOffset.UtcNow;