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-08-16 15:14:29 +07:00
parent acd4bed59f
commit 8f109d0863
12 changed files with 15854 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

8
BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
View file

@ -91,7 +91,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.PositionDate,
p.Reason,
p.EducationOld,
salary = p.AmountOld,
p.AmountOld,
p.PositionTypeOld,
p.PositionLevelOld,
p.PositionNumberOld,
@ -148,7 +148,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.CreatedAt,
p.Reason,
p.EducationOld,
salary = p.AmountOld,
p.AmountOld,
p.PositionTypeOld,
p.PositionLevelOld,
p.PositionNumberOld,
@ -199,7 +199,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.CreatedAt,
data.Reason,
data.EducationOld,
data.salary,
data.AmountOld,
data.PositionTypeOld,
data.PositionLevelOld,
data.PositionNumberOld,
@ -366,7 +366,6 @@ namespace BMA.EHR.Retirement.Service.Controllers
uppdated.PositionType = save;
}
uppdated.Amount = req.Amount;
uppdated.RecruitDate = req.RecruitDate;
uppdated.Status = "PENDING";
uppdated.LastUpdateFullName = FullName ?? "System Administrator";
@ -446,6 +445,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
uppdated.PositionTypeOld = req.PositionTypeOld;
uppdated.PositionLevelOld = req.PositionLevelOld;
uppdated.PositionNumberOld = req.PositionNumberOld;
uppdated.Amount = req.Amount;
uppdated.AmountOld = req.AmountOld;
uppdated.PositionDate = req.PositionDate;
uppdated.LastUpdateFullName = FullName ?? "System Administrator";