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 2024-07-01 14:12:15 +07:00
parent e060bd04ce
commit 2a20ac3d9d
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5793,6 +5793,7 @@ namespace BMA.EHR.Application.Repositories
MarkDiscipline = h.MarkDiscipline,
MarkLeave = h.MarkLeave,
MarkRate = h.MarkRate,
Salary = h.Salary == null ? 0 : h.Salary.Value,
// Docs = GetDocFile(h.Profile.Id),
MatchingConditions = h.MatchingConditions == null || h.MatchingConditions == "" ? null : JsonConvert.DeserializeObject<List<MatchingCondition>>(h.MatchingConditions)
})
@ -5812,8 +5813,7 @@ namespace BMA.EHR.Application.Repositories
h.Profile.ProfileSalary.OrderByDescending(x => x.Order).FirstOrDefault().PosNo,
Rank = h.Profile.PosLevel.PosLevelName,
Salary = h.Profile.ProfileSalary == null || h.Profile.ProfileSalary.Count == 0 ? "0" :
h.Profile.ProfileSalary.OrderByDescending(x => x.Order).FirstOrDefault().Amount.ToString(),
Salary = h.Salary.ToString(),
LastInsignia = h.Profile.ProfileInsignia == null || h.Profile.ProfileInsignia.Count == 0 ? "" :
GetInsigniaById(h.Profile.ProfileInsignia.OrderByDescending(x => x.Year).FirstOrDefault().Id.Value).Name,
RequestInsignia = h.RequestInsignia,