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

59
BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
View file

@ -713,7 +713,34 @@ 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,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
LeaveDate = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{
@ -886,7 +913,35 @@ 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,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
LeaveDate = _null,
MilitaryDate = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{