admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add handling for deactivated institution contracts in query logic

Browse Source
This commit is contained in:
MahanCh
2025-09-06 14:42:50 +03:30
parent 9e2ec49247
commit 5f7c27e45c
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
View File

@@ -1167,6 +1167,9 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
case InstitutionContractListStatus.Active:
joinedQuery = joinedQuery.Where(x => x.StatusPriority == (int)InstitutionContractListStatus.Active);
break;
case InstitutionContractListStatus.Deactive:
joinedQuery = joinedQuery.Where(x => x.contract.ContractEndGr < now);
break;
}
}
else
@@ -1219,7 +1222,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
var minArchiveCode = arc.Count > 0 ? arc.Min(a => a) : 0;
var archiveCode = minArchiveCode == 10000000 ? 0 : minArchiveCode;
var status =Enum.Parse<InstitutionContractListStatus>(x.StatusPriority.ToString());
var status = Enum.Parse<InstitutionContractListStatus>(x.StatusPriority.ToString());
return new GetInstitutionContractListItemsViewModel()
{
ContractAmount = x.contract.ContractAmount,
@@ -1402,6 +1405,9 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
case InstitutionContractListStatus.Active:
joinedQuery = joinedQuery.Where(x => x.StatusPriority == (int)InstitutionContractListStatus.Active);
break;
case InstitutionContractListStatus.Deactive:
joinedQuery = joinedQuery.Where(x => x.contract.ContractEndGr < now);
break;
}
}
else