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

report retire

Browse source
This commit is contained in:
moss 2025-04-04 11:43:19 +07:00
parent f68eae8120
commit 179d61cc16
2 changed files with 44 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

22
BMA.EHR.Retirement.Service/Controllers/RetirementController.cs
View file

@ -337,7 +337,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
.ThenBy(x => child3Order.ToObject<List<string>>().IndexOf(x.child3 ?? ""))
.ThenBy(x => child4Order.ToObject<List<string>>().IndexOf(x.child4 ?? ""))
.ThenBy(x => posTypeNameOrder.ToObject<List<string>>().IndexOf(x.posTypeName ?? ""))
.ThenBy(x => posLevelNameOrder.ToObject<List<string>>().IndexOf(x.posLevelName ?? "")))
.ThenBy(x => posLevelNameOrder.ToObject<List<string>>().IndexOf(x.posLevelName ?? ""))
.ThenBy(x => x.posNo))
{
var data = new RetirementProfile
{
@ -438,10 +439,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
return Error(GlobalMessages.RetirementNotCreated);
if (req.Option == null)
req.Option = "EDIT";
var profile_old = await _context.RetirementProfiles
.Where(x => x.RetirementPeriod == retire)
.Select((x,index) => new
.Select((x, index) => new
{
order = x.Order,
id = x.Id,
@ -1291,8 +1292,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
}
var retire = await _context.RetirementPeriods
.Include(x=>x.RetirementProfiles)
.Include(x=>x.RetirementRawProfiles)
.Include(x => x.RetirementProfiles)
.Include(x => x.RetirementRawProfiles)
.FirstOrDefaultAsync(x => x.Id == retireId);
if (retire == null)
return Error(GlobalMessages.RetirementNotFound, 404);
@ -1310,7 +1311,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
retire.LastUpdateUserId = UserId ?? "";
retire.LastUpdatedAt = DateTime.Now;
}
if(retire.TypeReport == null)
if (retire.TypeReport == null)
{
var apiUrl = $"{_configuration["API"]}/org/root/search/sort";
dynamic rootOrder = new List<string>();
@ -1351,7 +1352,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
.ThenBy(x => child3Order.ToObject<List<string>>().IndexOf(x.child3 ?? ""))
.ThenBy(x => child4Order.ToObject<List<string>>().IndexOf(x.child4 ?? ""))
.ThenBy(x => posTypeNameOrder.ToObject<List<string>>().IndexOf(x.posTypeName ?? ""))
.ThenBy(x => posLevelNameOrder.ToObject<List<string>>().IndexOf(x.posLevelName ?? "")))
.ThenBy(x => posLevelNameOrder.ToObject<List<string>>().IndexOf(x.posLevelName ?? ""))
.ThenBy(x => x.posNo))
{
profile.Order = order;
order++;
@ -1365,7 +1367,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
.ThenBy(x => child3Order.ToObject<List<string>>().IndexOf(x.child3 ?? ""))
.ThenBy(x => child4Order.ToObject<List<string>>().IndexOf(x.child4 ?? ""))
.ThenBy(x => posTypeNameOrder.ToObject<List<string>>().IndexOf(x.posTypeName ?? ""))
.ThenBy(x => posLevelNameOrder.ToObject<List<string>>().IndexOf(x.posLevelName ?? "")))
.ThenBy(x => posLevelNameOrder.ToObject<List<string>>().IndexOf(x.posLevelName ?? ""))
.ThenBy(x => x.posNo))
{
profile.Order = order;
order++;
@ -2119,7 +2122,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
[HttpGet("31/{exportType}/{Id}")]
public async Task<ActionResult<ResponseObject>> GetProfileRetirement([FromRoute] Guid Id, string exportType = "pdf")
{
var retire = await _service.GetProfileRetirementdAsync(Id,token);
var retire = await _service.GetProfileRetirementdAsync(Id, token);
return Success("xxx");
if (retire != null)
{
var reportfile = string.Empty;