b0n3l3sS/PIbd-23_Mochalov_D.V._LawFirm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'LabWork06_Base' into LabWork07_Base

Browse Source
This commit is contained in:
Данила Мочалов 2023-04-22 23:28:07 +04:00
commit 1227889856
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

3
LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs
View File

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

4
LawFirm/LawFirmDatabaseImplement/Models/Order.cs
View File

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