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

Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop
Some checks failed
release-dev / release-dev (push) Failing after 12s
Details

Browse source
This commit is contained in:
kittapath 2024-12-25 22:57:30 +07:00
commit 229c83a565
9 changed files with 399 additions and 358 deletions
Download patch file Download diff file Expand all files Collapse all files

16
BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
View file

@ -1039,13 +1039,15 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new {
fullName = _null,
positionname = r.RemarkHorizontal,
positionno = _null,
organizationname = _null,
salary = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new {
fullName = _null,
positionname = r.RemarkHorizontal,
positionno = _null,
organizationname = _null,
salary = _null,
});
}
}
return Success(result);
}

194
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
View file

@ -844,27 +844,29 @@ 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,
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);
}
@ -1054,27 +1056,29 @@ 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,
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);
}
@ -1261,21 +1265,23 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
OldOrganization = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
NewOc = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
OldOrganization = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
NewOc = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}
@ -1464,21 +1470,23 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
OldOc = _null,
OldPositionNumber = _null,
OldSalary = _null,
NewOc = _null,
NewPositionNumber = _null,
NewSalary = _null,
ReportingDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
OldOc = _null,
OldPositionNumber = _null,
OldSalary = _null,
NewOc = _null,
NewPositionNumber = _null,
NewSalary = _null,
ReportingDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}
@ -1678,26 +1686,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,
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,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}

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);
}

26
BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
View file

@ -628,18 +628,20 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
PositionName = _null,
Organization = _null,
StartDate = _null,
EndDate = _null,
Reason = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
PositionName = _null,
Organization = _null,
StartDate = _null,
EndDate = _null,
Reason = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}

42
BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
View file

@ -974,26 +974,28 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOrg = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldSalary = _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,
OldOrg = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldSalary = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}

34
BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
View file

@ -838,22 +838,24 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
OldOc = _null,
PositionType = _null,
PositionLevel = _null,
PositionNumber = _null,
Salary = _null,
ReceiveOrganizationName = _null,
ActiveDate = _null,
CommandExcecuteDate = _null,
Reason = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
OldOc = _null,
PositionType = _null,
PositionLevel = _null,
PositionNumber = _null,
Salary = _null,
ReceiveOrganizationName = _null,
ActiveDate = _null,
CommandExcecuteDate = _null,
Reason = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}

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);
}