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-12-27 00:17:02 +07:00
parent 38d149c213
commit 935e6e5a4b
4 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -342,7 +342,7 @@ namespace BMA.EHR.Placement.Service.Controllers
data.PositionTypeOld, data.PositionTypeOld,
data.PositionLevelOld, data.PositionLevelOld,
data.PositionNumberOld, data.PositionNumberOld,
organizationPositionOld = data.OrganizationPositionOld == "/" || data.OrganizationPositionOld == null ? null: data.OrganizationPositionOld, organizationPositionOld = data.OrganizationPositionOld == "/" || data.OrganizationPositionOld == null ? null : data.OrganizationPositionOld,
data.IsActive, data.IsActive,
data.rootOld, data.rootOld,
@ -489,7 +489,7 @@ namespace BMA.EHR.Placement.Service.Controllers
placementReceive.posLevelNameOld = org.result.posLevelName; placementReceive.posLevelNameOld = org.result.posLevelName;
// placementReceive.EducationOld = profile.Educations.Count() == 0 ? null : $"{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Degree}-{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Field}"; // placementReceive.EducationOld = profile.Educations.Count() == 0 ? null : $"{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Degree}-{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Field}";
// placementReceive.AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount; placementReceive.AmountOld = org.result.Amount;
placementReceive.PositionOld = org.result.position; placementReceive.PositionOld = org.result.position;
placementReceive.PositionLevelOld = org.result.posLevelName; placementReceive.PositionLevelOld = org.result.posLevelName;
@ -974,7 +974,8 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -1037,7 +1038,7 @@ namespace BMA.EHR.Placement.Service.Controllers
email = (String?)null, email = (String?)null,
phone = (String?)null, phone = (String?)null,
keycloak = string.Empty, keycloak = string.Empty,
isProbation = true, isProbation = false,
isLeave = false, isLeave = false,
dateRetire = (DateTime?)null, dateRetire = (DateTime?)null,
dateAppoint = r.commandAffectDate, dateAppoint = r.commandAffectDate,

1
BMA.EHR.Placement.Service/Requests/OrgRequest.cs
View file

@ -42,6 +42,7 @@ namespace BMA.EHR.Placement.Service.Requests
public string? posLevelName { get; set; } public string? posLevelName { get; set; }
public double? salary { get; set; } public double? salary { get; set; }
public string? education { get; set; } public string? education { get; set; }
public double? Amount { get; set; }
} }
} }

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

@ -946,7 +946,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementResign.posTypeNameOld = org.result.posTypeName; retirementResign.posTypeNameOld = org.result.posTypeName;
retirementResign.posLevelOldId = org.result.posLevelId; retirementResign.posLevelOldId = org.result.posLevelId;
retirementResign.posLevelNameOld = org.result.posLevelName; retirementResign.posLevelNameOld = org.result.posLevelName;
retirementResign.AmountOld = org.result.salary;
retirementResign.PositionOld = org.result.position; retirementResign.PositionOld = org.result.position;
retirementResign.PositionLevelOld = org.result.posLevelName; retirementResign.PositionLevelOld = org.result.posLevelName;
retirementResign.PositionTypeOld = org.result.posTypeName; retirementResign.PositionTypeOld = org.result.posTypeName;
@ -2394,7 +2394,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -2577,7 +2578,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new result.Add(new
{ {
No = _null, No = _null,

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

@ -889,7 +889,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementResignEmployee.posTypeNameOld = org.result.posTypeName; retirementResignEmployee.posTypeNameOld = org.result.posTypeName;
retirementResignEmployee.posLevelOldId = org.result.posLevelId; retirementResignEmployee.posLevelOldId = org.result.posLevelId;
retirementResignEmployee.posLevelNameOld = org.result.posLevelName; retirementResignEmployee.posLevelNameOld = org.result.posLevelName;
retirementResignEmployee.AmountOld = org.result.salary;
retirementResignEmployee.PositionOld = org.result.position; retirementResignEmployee.PositionOld = org.result.position;
retirementResignEmployee.PositionLevelOld = org.result.posLevelName; retirementResignEmployee.PositionLevelOld = org.result.posLevelName;
retirementResignEmployee.PositionTypeOld = org.result.posTypeName; retirementResignEmployee.PositionTypeOld = org.result.posTypeName;
@ -2337,7 +2337,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -2520,7 +2521,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new result.Add(new
{ {
No = _null, No = _null,