Merge branch 'LabWork06_Base' into LabWork07_Base
This commit is contained in:
commit
1227889856
1
.gitignore
vendored
1
.gitignore
vendored
@ -398,3 +398,4 @@ FodyWeavers.xsd
|
||||
# JetBrains Rider
|
||||
*.sln.iml
|
||||
|
||||
/LawFirm/ImplementationExtensions
|
||||
|
@ -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)
|
||||
{
|
||||
|
@ -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,
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user