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

no message

Browse source
This commit is contained in:
kittapath 2024-10-28 09:57:11 +07:00
parent b9814bd346
commit d356332718
11 changed files with 515 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1743,7 +1743,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
orderby r.Sequence
select new
{
Seq = r.Sequence.ToString().ToThaiNumber(),
No = r.Sequence.ToString().ToThaiNumber(),
CitizenId = r.CitizenId == null ? "-" : r.CitizenId.ToThaiNumber(),
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
PositionName = p.PositionOld ?? "",
@ -1757,7 +1757,30 @@ namespace BMA.EHR.Retirement.Service.Controllers
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
return Success(report_data);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
No = _null,
FullName = r.RemarkHorizontal,
CitizenId = _null,
PositionName = _null,
Organization = _null,
PositionLevel = _null,
PositionType = _null,
PositionNumber = _null,
ActiveDate = _null,
Salary = _null,
Remark = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{
@ -1984,7 +2007,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
orderby r.Sequence
select new
{
Seq = r.Sequence.ToString().ToThaiNumber(),
No = r.Sequence.ToString().ToThaiNumber(),
CitizenId = r.CitizenId == null ? "-" : r.CitizenId.ToThaiNumber(),
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
PositionName = p.PositionOld ?? "",
@ -1998,7 +2021,30 @@ namespace BMA.EHR.Retirement.Service.Controllers
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
return Success(report_data);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
No = _null,
FullName = r.RemarkHorizontal,
CitizenId = _null,
PositionName = _null,
Organization = _null,
PositionLevel = _null,
PositionType = _null,
PositionNumber = _null,
ActiveDate = _null,
Salary = _null,
Remark = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{