hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

fix คำนวนเครื่องราชย์ ลูกจ้าง

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-05-13 12:27:19 +07:00
parent e653b0e40a
commit 9e953cd5d6
2 changed files with 45 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

25
BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs
View file

@ -7859,6 +7859,19 @@ namespace BMA.EHR.Application.Repositories
result_candidate.Add(r);
}
// ย้ายที่ตามที่ มอสแจ้ง
if (period.Round != 1)
{
var insigniaIdList = await _dbContext.Set<Insignia>()
.Include(x => x.InsigniaType)
.Where(x => x.InsigniaType!.Name == "ชั้นสายสะพาย")
.Select(x => x.Id)
.ToListAsync();
result_candidate = result_candidate.Where(x => insigniaIdList.Contains(x.RequestInsignia.Id)).ToList();
}
foreach (var r in employee_type2)
{
var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
@ -7881,17 +7894,7 @@ namespace BMA.EHR.Application.Repositories
// result_candidate.Add(r);
//}
if (period.Round != 1)
{
var insigniaIdList = await _dbContext.Set<Insignia>()
.Include(x => x.InsigniaType)
.Where(x => x.InsigniaType!.Name == "ชั้นสายสะพาย")
.Select(x => x.Id)
.ToListAsync();
result_candidate = result_candidate.Where(x => insigniaIdList.Contains(x.RequestInsignia.Id)).ToList();
}
return result_candidate.OrderBy(x => x.Seq).ThenBy(x => x.Gender).ThenBy(x => x.ProfileId).ToList();
}