include query insignia
This commit is contained in:
parent
961f37ff62
commit
b25f52761f
1 changed files with 14 additions and 5 deletions
|
|
@ -4129,6 +4129,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Include(p => p.Insignias)
|
.Include(p => p.Insignias)
|
||||||
.ThenInclude(i => i.Insignia)
|
.ThenInclude(i => i.Insignia)
|
||||||
.Include(p => p.Salaries)
|
.Include(p => p.Salaries)
|
||||||
|
.Include(p => p.PositionLevel)
|
||||||
.Where(p =>
|
.Where(p =>
|
||||||
allOc.Contains(p.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OcId.Value) &&
|
allOc.Contains(p.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OcId.Value) &&
|
||||||
p.IsActive == true &&
|
p.IsActive == true &&
|
||||||
|
|
@ -4180,6 +4181,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Include(p => p.Insignias)
|
.Include(p => p.Insignias)
|
||||||
.ThenInclude(i => i.Insignia)
|
.ThenInclude(i => i.Insignia)
|
||||||
.Include(p => p.Salaries)
|
.Include(p => p.Salaries)
|
||||||
|
.Include(p => p.PositionLevel)
|
||||||
where allOc.Contains(p.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OcId.Value)
|
where allOc.Contains(p.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OcId.Value)
|
||||||
&& p.IsActive == true
|
&& p.IsActive == true
|
||||||
&& p.IsLeave == false
|
&& p.IsLeave == false
|
||||||
|
|
@ -4229,6 +4231,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Include(p => p.Insignias)
|
.Include(p => p.Insignias)
|
||||||
.ThenInclude(i => i.Insignia)
|
.ThenInclude(i => i.Insignia)
|
||||||
.Include(p => p.Salaries)
|
.Include(p => p.Salaries)
|
||||||
|
.Include(p => p.PositionLevel)
|
||||||
where p.IsActive == true
|
where p.IsActive == true
|
||||||
&& allOc.Contains(p.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OcId.Value)
|
&& allOc.Contains(p.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OcId.Value)
|
||||||
&& p.IsLeave == false
|
&& p.IsLeave == false
|
||||||
|
|
@ -4277,6 +4280,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Include(p => p.Insignias)
|
.Include(p => p.Insignias)
|
||||||
.ThenInclude(i => i.Insignia)
|
.ThenInclude(i => i.Insignia)
|
||||||
.Include(p => p.Salaries)
|
.Include(p => p.Salaries)
|
||||||
|
.Include(p => p.PositionLevel)
|
||||||
where p.IsActive == true
|
where p.IsActive == true
|
||||||
&& allOc.Contains(p.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OcId.Value)
|
&& allOc.Contains(p.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OcId.Value)
|
||||||
&& p.IsLeave == false
|
&& p.IsLeave == false
|
||||||
|
|
@ -4326,6 +4330,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Include(p => p.Insignias)
|
.Include(p => p.Insignias)
|
||||||
.ThenInclude(i => i.Insignia)
|
.ThenInclude(i => i.Insignia)
|
||||||
.Include(p => p.Salaries)
|
.Include(p => p.Salaries)
|
||||||
|
.Include(p => p.PositionLevel)
|
||||||
where p.IsActive == true
|
where p.IsActive == true
|
||||||
&& allOc.Contains(p.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OcId.Value)
|
&& allOc.Contains(p.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OcId.Value)
|
||||||
&& p.IsLeave == false
|
&& p.IsLeave == false
|
||||||
|
|
@ -4358,6 +4363,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Include(p => p.Insignias)
|
.Include(p => p.Insignias)
|
||||||
.ThenInclude(i => i.Insignia)
|
.ThenInclude(i => i.Insignia)
|
||||||
.Include(p => p.Salaries)
|
.Include(p => p.Salaries)
|
||||||
|
.Include(p => p.PositionLevel)
|
||||||
where p.IsActive == true
|
where p.IsActive == true
|
||||||
&& allOc.Contains(p.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OcId.Value)
|
&& allOc.Contains(p.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OcId.Value)
|
||||||
&& p.IsLeave == false
|
&& p.IsLeave == false
|
||||||
|
|
@ -4408,6 +4414,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Include(p => p.Insignias)
|
.Include(p => p.Insignias)
|
||||||
.ThenInclude(i => i.Insignia)
|
.ThenInclude(i => i.Insignia)
|
||||||
.Include(p => p.Salaries)
|
.Include(p => p.Salaries)
|
||||||
|
.Include(p => p.PositionLevel)
|
||||||
where p.IsActive == true
|
where p.IsActive == true
|
||||||
&& allOc.Contains(p.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OcId.Value)
|
&& allOc.Contains(p.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OcId.Value)
|
||||||
&& p.IsLeave == false
|
&& p.IsLeave == false
|
||||||
|
|
@ -4457,6 +4464,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Include(p => p.Insignias)
|
.Include(p => p.Insignias)
|
||||||
.ThenInclude(i => i.Insignia)
|
.ThenInclude(i => i.Insignia)
|
||||||
.Include(p => p.Salaries)
|
.Include(p => p.Salaries)
|
||||||
|
.Include(p => p.PositionLevel)
|
||||||
where p.IsActive == true
|
where p.IsActive == true
|
||||||
&& allOc.Contains(p.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OcId.Value)
|
&& allOc.Contains(p.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OcId.Value)
|
||||||
&& p.IsLeave == false
|
&& p.IsLeave == false
|
||||||
|
|
@ -4506,6 +4514,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.Include(p => p.Insignias)
|
.Include(p => p.Insignias)
|
||||||
.ThenInclude(i => i.Insignia)
|
.ThenInclude(i => i.Insignia)
|
||||||
.Include(p => p.Salaries)
|
.Include(p => p.Salaries)
|
||||||
|
.Include(p => p.PositionLevel)
|
||||||
where p.IsActive == true
|
where p.IsActive == true
|
||||||
&& allOc.Contains(p.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OcId.Value)
|
&& allOc.Contains(p.OcId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OcId.Value)
|
||||||
&& p.IsLeave == false
|
&& p.IsLeave == false
|
||||||
|
|
@ -4612,7 +4621,7 @@ namespace BMA.EHR.Application.Repositories
|
||||||
var type3_level11 = await GetInsigniaCandidate_Type3_Level11(periodId, ocId);
|
var type3_level11 = await GetInsigniaCandidate_Type3_Level11(periodId, ocId);
|
||||||
var type4_level10 = await GetInsigniaCandidate_Type4_Level10(periodId, ocId);
|
var type4_level10 = await GetInsigniaCandidate_Type4_Level10(periodId, ocId);
|
||||||
var type4_level11 = await GetInsigniaCandidate_Type4_Level11(periodId, ocId);
|
var type4_level11 = await GetInsigniaCandidate_Type4_Level11(periodId, ocId);
|
||||||
// var type_coin = await GetInsigniaCandidate(periodId, ocId);
|
var type_coin = await GetInsigniaCandidate(periodId, ocId);
|
||||||
|
|
||||||
// union result
|
// union result
|
||||||
foreach (var r in type4_level11)
|
foreach (var r in type4_level11)
|
||||||
|
|
@ -4699,10 +4708,10 @@ namespace BMA.EHR.Application.Repositories
|
||||||
if (old == null)
|
if (old == null)
|
||||||
result_candidate.Add(r);
|
result_candidate.Add(r);
|
||||||
}
|
}
|
||||||
// foreach (var r in type_coin)
|
foreach (var r in type_coin)
|
||||||
// {
|
{
|
||||||
// result_candidate.Add(r);
|
result_candidate.Add(r);
|
||||||
// }
|
}
|
||||||
|
|
||||||
return result_candidate.OrderBy(x => x.Seq).ThenBy(x => x.Gender).ThenBy(x => x.ProfileId).ToList();
|
return result_candidate.OrderBy(x => x.Seq).ThenBy(x => x.Gender).ThenBy(x => x.ProfileId).ToList();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue