Merge branch 'LabWork06_Base' into LabWork07_Base

This commit is contained in:
Данила Мочалов 2023-04-22 23:28:07 +04:00
commit 1227889856
3 changed files with 5 additions and 3 deletions

1
.gitignore vendored
View File

@ -398,3 +398,4 @@ FodyWeavers.xsd
# JetBrains Rider
*.sln.iml
/LawFirm/ImplementationExtensions

View File

@ -70,7 +70,8 @@ namespace LawFirmBusinessLogic.BusinessLogics
DateCreate = viewModel.DateCreate,
DateImplement = viewModel.DateImplement,
Count = viewModel.Count,
Sum = viewModel.Sum
Sum = viewModel.Sum,
ImplementerId = viewModel.ImplementerId
};
if (rawModel.ImplementerId.HasValue)
{

View File

@ -78,8 +78,8 @@ namespace LawFirmDatabaseImplement.Models
DateImplement = DateImplement,
Id = Id,
Status = Status,
DocumentName = Document.DocumentName,
ClientFIO = Client.ClientFIO,
DocumentName = Document?.DocumentName ?? string.Empty,
ClientFIO = Client?.ClientFIO ?? string.Empty,
ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty,
};
}