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

เพิ่มเงินเดือนกรณีเพิ่มเครื่องราช

Browse source
This commit is contained in:
Kittapath 2023-11-16 20:08:28 +07:00
parent b59d00925f
commit 9880d6530b
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs
View file

@ -1032,7 +1032,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
var insigniaPeriod = await _context.InsigniaPeriods.FirstOrDefaultAsync(x => x.Id == req.insigniaPeriodId); var insigniaPeriod = await _context.InsigniaPeriods.FirstOrDefaultAsync(x => x.Id == req.insigniaPeriodId);
if (insigniaPeriod == null) if (insigniaPeriod == null)
return Error(GlobalMessages.InsigniaRequestNotFound); return Error(GlobalMessages.InsigniaRequestNotFound);
var profile = await _context.Profiles.FirstOrDefaultAsync(x => x.Id == req.ProfileId); var profile = await _context.Profiles.Include(x => x.Salaries).FirstOrDefaultAsync(x => x.Id == req.ProfileId);
if (profile == null) if (profile == null)
return Error(GlobalMessages.DataNotFound); return Error(GlobalMessages.DataNotFound);
var insignia = await _context.Insignias.FirstOrDefaultAsync(x => x.Id == req.insigniaId); var insignia = await _context.Insignias.FirstOrDefaultAsync(x => x.Id == req.insigniaId);
@ -1089,6 +1089,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
Reason = req.Reason, Reason = req.Reason,
RequestDate = DateTime.Now, RequestDate = DateTime.Now,
MatchingConditions = System.Text.Json.JsonSerializer.Serialize(new List<dynamic>()), // serialize to string MatchingConditions = System.Text.Json.JsonSerializer.Serialize(new List<dynamic>()), // serialize to string
Salary = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount,
CreatedUserId = UserId ?? "System Administrator", CreatedUserId = UserId ?? "System Administrator",
CreatedFullName = FullName ?? "", CreatedFullName = FullName ?? "",
CreatedAt = DateTime.Now, CreatedAt = DateTime.Now,