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

sort retire

Browse source
This commit is contained in:
kittapath 2025-10-30 22:52:22 +07:00
parent d65107ad40
commit eab9617f24
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -487,6 +487,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
positionArea = x.positionArea, positionArea = x.positionArea,
posNo = x.posNo, posNo = x.posNo,
}) })
.OrderBy(x => x.order)
.ToListAsync(); .ToListAsync();
var file_name = $"retire_tmp_{DateTime.Now.ToString("yyyyMMddTHHmmss")}"; var file_name = $"retire_tmp_{DateTime.Now.ToString("yyyyMMddTHHmmss")}";
var profile = Newtonsoft.Json.JsonConvert.SerializeObject(profile_old); var profile = Newtonsoft.Json.JsonConvert.SerializeObject(profile_old);
@ -603,6 +604,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
return Error(GlobalMessages.RetirementNotFound, 404); return Error(GlobalMessages.RetirementNotFound, 404);
var profileOlds = await _context.RetirementProfiles.AsQueryable() var profileOlds = await _context.RetirementProfiles.AsQueryable()
.Where(x => x.RetirementPeriod == retireOld) .Where(x => x.RetirementPeriod == retireOld)
.OrderBy(x => x.Order)
.ToListAsync(); .ToListAsync();
if (profileOlds != null) if (profileOlds != null)
{ {
@ -695,6 +697,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
positionArea = x.positionArea, positionArea = x.positionArea,
posNo = x.posNo, posNo = x.posNo,
}) })
.OrderBy(x => x.order)
.ToListAsync(); .ToListAsync();
// var profile_news = new List<ProfileJsonRequest>(); // var profile_news = new List<ProfileJsonRequest>();
// foreach (var r in profile_new) // foreach (var r in profile_new)
@ -811,6 +814,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
// positionEmployeeGroup = x.Profile.PositionEmployeeGroup == null ? null : x.Profile.PositionEmployeeGroup.Name, // positionEmployeeGroup = x.Profile.PositionEmployeeGroup == null ? null : x.Profile.PositionEmployeeGroup.Name,
// posNoEmployee = x.Profile.PosNoEmployee, // posNoEmployee = x.Profile.PosNoEmployee,
}) })
.OrderBy(x => x.order)
.ToListAsync(); .ToListAsync();
// var profile_news = new List<ProfileJsonRequest>(); // var profile_news = new List<ProfileJsonRequest>();
// foreach (var r in profile_new) // foreach (var r in profile_new)