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

test retire
Some checks failed
release-dev / release-dev (push) Failing after 10s
Details

Browse source
This commit is contained in:
kittapath 2025-01-17 14:20:44 +07:00
parent d516e265e0
commit ae513bbbd5
2 changed files with 12 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -877,44 +877,28 @@ namespace BMA.EHR.Retirement.Service.Controllers
[HttpPost()]
public async Task<ActionResult<ResponseObject>> Post([FromForm] RetirementResignRequest req)
{
// var profile = await _context.Profiles
// .Include(x => x.PositionLevel)
// .Include(x => x.PositionType)
// .Include(x => x.PosNo)
// .Include(x => x.Salaries)
// .Include(x => x.Position)
// .Include(x => x.Prefix)
// .FirstOrDefaultAsync(x => x.KeycloakId == Guid.Parse(UserId));
// if (profile == null)
// return Error(GlobalMessages.DataNotFound, 404);
var Remark = req.Remark;
if (req.Reason != null)
{
switch (req.Reason.Trim().ToLower())
{
case "CAREER": Remark = $"ประกอบอาชีพอื่น ({req.Remark})"; break;
case "MOVE": Remark = $"รับราชการสังกัดอื่น ({req.Remark})"; break;
case "FAMILY": Remark = $"ดูแลบิดามารดา ({req.Remark})"; break;
case "EDUCATION": Remark = $"ศึกษาต่อ ({req.Remark})"; break;
case "OTHER": Remark = $"อื่น ๆ ({req.Remark})"; break;
case "CAREER": Remark = $"ประกอบอาชีพอื่น" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break;
case "MOVE": Remark = $"รับราชการสังกัดอื่น" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break;
case "FAMILY": Remark = $"ดูแลบิดามารดา" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break;
case "EDUCATION": Remark = $"ศึกษาต่อ" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break;
case "OTHER": Remark = $"อื่น ๆ" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break;
default: Remark = req.Reason.Trim().ToLower(); break;
}
}
var retirementResign = new RetirementResign
{
// Profile = profile,
Location = req.Location,
SendDate = DateTime.Now,
ActiveDate = req.ActiveDate,
Reason = req.Reason,
ReasonResign = Remark,
Remark = req.Remark,
// AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount,
// PositionLevelOld = profile.PositionLevel == null ? null : profile.PositionLevel.Name,
// PositionTypeOld = profile.PositionType == null ? null : profile.PositionType.Name,
// PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name,
// OrganizationPositionOld = profile.Position == null ? profile.Oc : $"{profile.Position.Name}-{profile.Oc}",
Status = "WAITTING",
IsActive = true,
CreatedFullName = FullName ?? "System Administrator",

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

@ -820,43 +820,27 @@ namespace BMA.EHR.Retirement.Service.Controllers
[HttpPost()]
public async Task<ActionResult<ResponseObject>> Post([FromForm] RetirementResignEmployeeRequest req)
{
// var profile = await _context.Profiles
// .Include(x => x.PositionLevel)
// .Include(x => x.PositionType)
// .Include(x => x.PosNo)
// .Include(x => x.Salaries)
// .Include(x => x.Position)
// .Include(x => x.Prefix)
// .FirstOrDefaultAsync(x => x.KeycloakId == Guid.Parse(UserId));
// if (profile == null)
// return Error(GlobalMessages.DataNotFound, 404);
var Remark = req.Remark;
if (req.Reason != null)
{
switch (req.Reason.Trim().ToLower())
{
case "CAREER": Remark = $"ประกอบอาชีพอื่น ({req.Remark})"; break;
case "MOVE": Remark = $"รับราชการสังกัดอื่น ({req.Remark})"; break;
case "FAMILY": Remark = $"ดูแลบิดามารดา ({req.Remark})"; break;
case "EDUCATION": Remark = $"ศึกษาต่อ ({req.Remark})"; break;
case "OTHER": Remark = $"อื่น ๆ ({req.Remark})"; break;
case "CAREER": Remark = $"ประกอบอาชีพอื่น" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break;
case "MOVE": Remark = $"รับราชการสังกัดอื่น" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break;
case "FAMILY": Remark = $"ดูแลบิดามารดา" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break;
case "EDUCATION": Remark = $"ศึกษาต่อ" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break;
case "OTHER": Remark = $"อื่น ๆ" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break;
default: Remark = "test"; break;
}
}
var retirementResignEmployee = new RetirementResignEmployee
{
// Profile = profile,
Location = req.Location,
SendDate = DateTime.Now,
ActiveDate = req.ActiveDate,
Reason = req.Reason,
ReasonResign = Remark,
Remark = req.Remark,
// AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount,
// PositionLevelOld = profile.PositionLevel == null ? null : profile.PositionLevel.Name,
// PositionTypeOld = profile.PositionType == null ? null : profile.PositionType.Name,
// PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name,
// OrganizationPositionOld = profile.Position == null ? profile.Oc : $"{profile.Position.Name}-{profile.Oc}",
Status = "WAITTING",
IsActive = true,
CreatedFullName = FullName ?? "System Administrator",