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

ส่งเหตุผลเป็น ENG #1714
Some checks failed
release-dev / release-dev (push) Failing after 12s
Details

Browse source
This commit is contained in:
Bright 2025-08-01 10:26:07 +07:00
parent 71dc9f05d3
commit 593e5a3f57
2 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -3587,11 +3587,23 @@ namespace BMA.EHR.Retirement.Service.Controllers
if (updated == null) if (updated == null)
return Error(GlobalMessages.RetirementResignNotFound, 404); return Error(GlobalMessages.RetirementResignNotFound, 404);
var ReasonResign = req.ReasonResign;
if (req.ReasonResign != null)
{
switch (req.ReasonResign.Trim().ToUpper())
{
case "CAREER": ReasonResign = $"ประกอบอาชีพอื่น"; break;
case "MOVE": ReasonResign = $"รับราชการสังกัดอื่น"; break;
case "FAMILY": ReasonResign = $"ดูแลบิดามารดา"; break;
case "EDUCATION": ReasonResign = $"ศึกษาต่อ"; break;
case "OTHER": ReasonResign = $"อื่น ๆ"; break;
default: ReasonResign = string.Empty; break;
}
}
updated.Location = !string.IsNullOrEmpty(req.Location) ? req.Location : updated.Location; updated.Location = !string.IsNullOrEmpty(req.Location) ? req.Location : updated.Location;
updated.ReasonResign = !string.IsNullOrEmpty(req.ReasonResign) ? req.ReasonResign : updated.ReasonResign; updated.ReasonResign = !string.IsNullOrEmpty(ReasonResign) ? ReasonResign : updated.ReasonResign;
updated.Remark = !string.IsNullOrEmpty(req.ReasonResign) && req.ReasonResign == "อื่น ๆ" && !string.IsNullOrEmpty(req.Remark) updated.Remark = !string.IsNullOrEmpty(req.Remark) ? req.Remark : null;
? req.Remark
: null;
updated.SendDate = req.SendDate.HasValue ? req.SendDate : updated.SendDate; updated.SendDate = req.SendDate.HasValue ? req.SendDate : updated.SendDate;
updated.ActiveDate = req.ActiveDate.HasValue ? req.ActiveDate : updated.ActiveDate; updated.ActiveDate = req.ActiveDate.HasValue ? req.ActiveDate : updated.ActiveDate;
updated.LastUpdateFullName = FullName ?? "System Administrator"; updated.LastUpdateFullName = FullName ?? "System Administrator";

20
BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
View file

@ -3054,11 +3054,23 @@ namespace BMA.EHR.Retirement.Service.Controllers
if (updated == null) if (updated == null)
return Error(GlobalMessages.RetirementResignNotFound, 404); return Error(GlobalMessages.RetirementResignNotFound, 404);
var ReasonResign = req.ReasonResign;
if (req.ReasonResign != null)
{
switch (req.ReasonResign.Trim().ToUpper())
{
case "CAREER": ReasonResign = $"ประกอบอาชีพอื่น"; break;
case "MOVE": ReasonResign = $"รับราชการสังกัดอื่น"; break;
case "FAMILY": ReasonResign = $"ดูแลบิดามารดา"; break;
case "EDUCATION": ReasonResign = $"ศึกษาต่อ"; break;
case "OTHER": ReasonResign = $"อื่น ๆ"; break;
default: ReasonResign = string.Empty; break;
}
}
updated.Location = !string.IsNullOrEmpty(req.Location) ? req.Location : updated.Location; updated.Location = !string.IsNullOrEmpty(req.Location) ? req.Location : updated.Location;
updated.ReasonResign = !string.IsNullOrEmpty(req.ReasonResign) ? req.ReasonResign : updated.ReasonResign; updated.ReasonResign = !string.IsNullOrEmpty(ReasonResign) ? ReasonResign : updated.ReasonResign;
updated.Remark = !string.IsNullOrEmpty(req.ReasonResign) && req.ReasonResign == "อื่น ๆ" && !string.IsNullOrEmpty(req.Remark) updated.Remark = !string.IsNullOrEmpty(req.Remark) ? req.Remark : null;
? req.Remark
: null;
updated.SendDate = req.SendDate.HasValue ? req.SendDate : updated.SendDate; updated.SendDate = req.SendDate.HasValue ? req.SendDate : updated.SendDate;
updated.ActiveDate = req.ActiveDate.HasValue ? req.ActiveDate : updated.ActiveDate; updated.ActiveDate = req.ActiveDate.HasValue ? req.ActiveDate : updated.ActiveDate;
updated.LastUpdateFullName = FullName ?? "System Administrator"; updated.LastUpdateFullName = FullName ?? "System Administrator";