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

step ระบบลาออก
Some checks failed
release-dev / release-dev (push) Failing after 11s
Details

Browse source
This commit is contained in:
moss 2025-05-23 10:49:40 +07:00
parent 5c789232f1
commit dc3c5a82a1
9 changed files with 20845 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -265,6 +265,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.IsActive,
p.CreatedAt,
p.ApproveStep,
p.Group,
})
.ToListAsync();
@ -424,6 +425,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.IsDiscipline,
p.CancelReason,
p.ApproveStep,
p.Group,
Approvers = p.Approvers.Where(x => x.ApproveType.ToUpper() == "APPROVER"),
Commanders = p.Approvers.Where(x => x.ApproveType.ToUpper() == "COMMANDER"),
KeycloakUserId = p.CreatedUserId,
@ -510,6 +512,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.Approvers,
data.Commanders,
data.ApproveStep,
data.Group,
idCancel = data.RetirementResignCancels?.Id ?? null,
statusCancel = data.RetirementResignCancels?.Status ?? null,
statusMain = data.Status == "CANCEL" ? "DONECANCEL" : data.Status,
@ -891,6 +894,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
var retirementResign = new RetirementResign
{
ApproveStep = "st1",
Location = req.Location,
SendDate = DateTime.Now,
ActiveDate = req.ActiveDate,
@ -963,6 +967,19 @@ namespace BMA.EHR.Retirement.Service.Controllers
(org.result.child1 == null ? "" : org.result.child1 + "\n") +
(org.result.root == null ? "" : org.result.root);
retirementResign.OrganizationPositionOld = org.result.position + "\n" + (retirementResign.PositionExecutiveOld == null ? "" : retirementResign.PositionExecutiveOld + "\n") + retirementResign.OrganizationOld;
if ((retirementResign.posTypeNameOld == "ทั่วไป" && retirementResign.posLevelNameOld == "ชำนาญงาน") || (retirementResign.posTypeNameOld == "ทั่วไป" && retirementResign.posLevelNameOld == "ปฏิบัติงาน") || (retirementResign.posTypeNameOld == "วิชาการ" && retirementResign.posLevelNameOld == "ปฏิบัติการ") || (retirementResign.posTypeNameOld == "วิชาการ" && retirementResign.posLevelNameOld == "ชำนาญการ"))
{
retirementResign.Group = "1.1";
}
else if ((retirementResign.posTypeNameOld == "ทั่วไป" && retirementResign.posLevelNameOld == "อาวุโส") || (retirementResign.posTypeNameOld == "วิชาการ" && retirementResign.posLevelNameOld == "ชำนาญการพิเศษ") || (retirementResign.posTypeNameOld == "อำนวยการ" && retirementResign.posLevelNameOld == "ต้น"))
{
retirementResign.Group = "1.2";
}
else if ((retirementResign.posTypeNameOld == "ทั่วไป" && retirementResign.posLevelNameOld == "ทักษะพิเศษ") || (retirementResign.posTypeNameOld == "วิชาการ" && retirementResign.posLevelNameOld == "เชี่ยวชาญ") || (retirementResign.posTypeNameOld == "วิชาการ" && retirementResign.posLevelNameOld == "ทรงคุณวุฒิ") || (retirementResign.posTypeNameOld == "อำนวยการ" && retirementResign.posLevelNameOld == "สูง") || (retirementResign.posTypeNameOld == "บริหาร" && retirementResign.posLevelNameOld == "ต้น") || (retirementResign.posTypeNameOld == "บริหาร" && retirementResign.posLevelNameOld == "สูง"))
{
retirementResign.Group = "2";
}
}
await _context.RetirementResigns.AddAsync(retirementResign);
await _context.SaveChangesAsync();
@ -1260,6 +1277,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
});
}
updated.IsCancel = true;
updated.Status = "CANCELING";
}
else if (updated.Status == "REPORT")
{
@ -1271,8 +1289,12 @@ namespace BMA.EHR.Retirement.Service.Controllers
Console.WriteLine(_res);
Console.WriteLine($"{_configuration["API"]}/org/command/tab2Cancel17/{updated.Id}");
}
updated.Status = "CANCELING";
}
else
{
updated.Status = "CANCEL";
}
updated.Status = "CANCEL";
updated.LastUpdateFullName = FullName ?? "System Administrator";
updated.LastUpdateUserId = UserId ?? "";
updated.LastUpdatedAt = DateTime.Now;

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

@ -204,6 +204,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.IsActive,
p.CreatedAt,
p.ApproveStep,
p.Group,
})
.ToListAsync();
@ -363,6 +364,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.IsDiscipline,
p.CancelReason,
p.ApproveStep,
p.Group,
Approvers = p.Approvers.Where(x => x.ApproveType.ToUpper() == "APPROVER"),
Commanders = p.Approvers.Where(x => x.ApproveType.ToUpper() == "COMMANDER"),
KeycloakUserId = p.CreatedUserId,
@ -449,6 +451,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.Approvers,
data.Commanders,
data.ApproveStep,
data.Group,
idCancel = data.RetirementResignEmployeeCancels?.Id ?? Guid.Empty,
statusCancel = data.RetirementResignEmployeeCancels?.Status ?? null,
statusMain = data.Status,
@ -828,6 +831,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
}
var retirementResignEmployee = new RetirementResignEmployee
{
ApproveStep = "st1",
Location = req.Location,
SendDate = DateTime.Now,
ActiveDate = req.ActiveDate,
@ -899,6 +903,18 @@ namespace BMA.EHR.Retirement.Service.Controllers
(org.result.child1 == null ? "" : org.result.child1 + "\n") +
(org.result.root == null ? "" : org.result.root);
retirementResignEmployee.OrganizationPositionOld = org.result.position + "\n" + retirementResignEmployee.OrganizationOld;
if ((retirementResignEmployee.posTypeNameOld == "ทั่วไป" && retirementResignEmployee.posLevelNameOld == "ชำนาญงาน") || (retirementResignEmployee.posTypeNameOld == "ทั่วไป" && retirementResignEmployee.posLevelNameOld == "ปฏิบัติงาน") || (retirementResignEmployee.posTypeNameOld == "วิชาการ" && retirementResignEmployee.posLevelNameOld == "ปฏิบัติการ") || (retirementResignEmployee.posTypeNameOld == "วิชาการ" && retirementResignEmployee.posLevelNameOld == "ชำนาญการ"))
{
retirementResignEmployee.Group = "1.1";
}
else if ((retirementResignEmployee.posTypeNameOld == "ทั่วไป" && retirementResignEmployee.posLevelNameOld == "อาวุโส") || (retirementResignEmployee.posTypeNameOld == "วิชาการ" && retirementResignEmployee.posLevelNameOld == "ชำนาญการพิเศษ") || (retirementResignEmployee.posTypeNameOld == "อำนวยการ" && retirementResignEmployee.posLevelNameOld == "ต้น"))
{
retirementResignEmployee.Group = "1.2";
}
else if ((retirementResignEmployee.posTypeNameOld == "ทั่วไป" && retirementResignEmployee.posLevelNameOld == "ทักษะพิเศษ") || (retirementResignEmployee.posTypeNameOld == "วิชาการ" && retirementResignEmployee.posLevelNameOld == "เชี่ยวชาญ") || (retirementResignEmployee.posTypeNameOld == "วิชาการ" && retirementResignEmployee.posLevelNameOld == "ทรงคุณวุฒิ") || (retirementResignEmployee.posTypeNameOld == "อำนวยการ" && retirementResignEmployee.posLevelNameOld == "สูง") || (retirementResignEmployee.posTypeNameOld == "บริหาร" && retirementResignEmployee.posLevelNameOld == "ต้น") || (retirementResignEmployee.posTypeNameOld == "บริหาร" && retirementResignEmployee.posLevelNameOld == "สูง"))
{
retirementResignEmployee.Group = "2";
}
}
await _context.RetirementResignEmployees.AddAsync(retirementResignEmployee);
await _context.SaveChangesAsync();
@ -1166,6 +1182,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
});
}
updated.IsCancel = true;
updated.Status = "CANCELING";
}
else if (updated.Status == "REPORT")
{
@ -1175,8 +1192,12 @@ namespace BMA.EHR.Retirement.Service.Controllers
client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
var _res = await client.DeleteAsync($"{_configuration["API"]}/org/command/tab2Cancel23/{updated.Id}");
}
updated.Status = "CANCELING";
}
else
{
updated.Status = "CANCEL";
}
updated.Status = "CANCEL";
updated.LastUpdateFullName = FullName ?? "System Administrator";
updated.LastUpdateUserId = UserId ?? "";
updated.LastUpdatedAt = DateTime.Now;