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

219
BMA.EHR.Placement.Service/Controllers/PlacementController.cs
View file

@ -1623,27 +1623,30 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
PositionName = _null,
ExamNumber = _null,
PlacementName = _null,
Oc = _null,
PositionType = _null,
PositionLevel = _null,
PositionNumber = _null,
Salary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
OccupationPosition = _null,
PositionCandidate = _null,
OcCandidate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
PositionName = _null,
ExamNumber = _null,
PlacementName = _null,
Oc = _null,
PositionType = _null,
PositionLevel = _null,
PositionNumber = _null,
Salary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
OccupationPosition = _null,
PositionCandidate = _null,
OcCandidate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}
@ -1927,26 +1930,28 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
PositionName = _null,
ExamNumber = _null,
PlacementName = _null,
Oc = _null,
PositionType = _null,
PositionLevel = _null,
PositionNumber = _null,
Salary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
OccupationPosition = _null,
PositionCandidate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
PositionName = _null,
ExamNumber = _null,
PlacementName = _null,
Oc = _null,
PositionType = _null,
PositionLevel = _null,
PositionNumber = _null,
Salary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
OccupationPosition = _null,
PositionCandidate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}
@ -2250,28 +2255,30 @@ namespace BMA.EHR.Placement.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,
OldPosition = _null,
NewOc = _null,
NewPosition = _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,
OldPosition = _null,
NewOc = _null,
NewPosition = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}
@ -2476,28 +2483,30 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPosition = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
NewOc = _null,
NewPosition = _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,
OldPosition = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
NewOc = _null,
NewPosition = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}
@ -2693,26 +2702,28 @@ namespace BMA.EHR.Placement.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,
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,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}