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

fix หมายเหตุแนวนอน

Browse source
This commit is contained in:
Bright 2024-12-25 18:15:38 +07:00
parent 39acbb7f95
commit a521eb345d
9 changed files with 399 additions and 358 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -721,27 +721,29 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
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,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
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,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}
@ -925,28 +927,30 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
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,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
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,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}

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

@ -2394,22 +2394,24 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
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,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
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);
}
@ -2575,22 +2577,24 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
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,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
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);
}

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

@ -2337,22 +2337,24 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
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,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
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);
}
@ -2518,22 +2520,24 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
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,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
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);
}