diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs index 5eb0f505..33e31c73 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -342,7 +342,7 @@ namespace BMA.EHR.Placement.Service.Controllers data.PositionTypeOld, data.PositionLevelOld, data.PositionNumberOld, - organizationPositionOld = data.OrganizationPositionOld == "/" || data.OrganizationPositionOld == null ? null: data.OrganizationPositionOld, + organizationPositionOld = data.OrganizationPositionOld == "/" || data.OrganizationPositionOld == null ? null : data.OrganizationPositionOld, data.IsActive, data.rootOld, @@ -489,7 +489,7 @@ namespace BMA.EHR.Placement.Service.Controllers 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.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.PositionLevelOld = org.result.posLevelName; @@ -974,7 +974,8 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") + { result.Add(new { No = _null, @@ -994,7 +995,7 @@ namespace BMA.EHR.Placement.Service.Controllers CommandExcecuteDate = _null, RemarkHorizontal = _null, RemarkVertical = _null, - }); + }); } } return Success(result); @@ -1037,7 +1038,7 @@ namespace BMA.EHR.Placement.Service.Controllers email = (String?)null, phone = (String?)null, keycloak = string.Empty, - isProbation = true, + isProbation = false, isLeave = false, dateRetire = (DateTime?)null, dateAppoint = r.commandAffectDate, diff --git a/BMA.EHR.Placement.Service/Requests/OrgRequest.cs b/BMA.EHR.Placement.Service/Requests/OrgRequest.cs index 61e77526..219566df 100644 --- a/BMA.EHR.Placement.Service/Requests/OrgRequest.cs +++ b/BMA.EHR.Placement.Service/Requests/OrgRequest.cs @@ -42,6 +42,7 @@ namespace BMA.EHR.Placement.Service.Requests public string? posLevelName { get; set; } public double? salary { get; set; } public string? education { get; set; } + public double? Amount { get; set; } } } \ No newline at end of file diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index 7507add9..960075ed 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -946,7 +946,7 @@ namespace BMA.EHR.Retirement.Service.Controllers retirementResign.posTypeNameOld = org.result.posTypeName; retirementResign.posLevelOldId = org.result.posLevelId; retirementResign.posLevelNameOld = org.result.posLevelName; - + retirementResign.AmountOld = org.result.salary; retirementResign.PositionOld = org.result.position; retirementResign.PositionLevelOld = org.result.posLevelName; retirementResign.PositionTypeOld = org.result.posTypeName; @@ -2394,7 +2394,8 @@ namespace BMA.EHR.Retirement.Service.Controllers { result.Add(r); string? _null = null; - if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") + { result.Add(new { No = _null, @@ -2577,7 +2578,8 @@ namespace BMA.EHR.Retirement.Service.Controllers { result.Add(r); string? _null = null; - if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") + { result.Add(new { No = _null, diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs index 86a554c6..001a020c 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs @@ -889,7 +889,7 @@ namespace BMA.EHR.Retirement.Service.Controllers retirementResignEmployee.posTypeNameOld = org.result.posTypeName; retirementResignEmployee.posLevelOldId = org.result.posLevelId; retirementResignEmployee.posLevelNameOld = org.result.posLevelName; - + retirementResignEmployee.AmountOld = org.result.salary; retirementResignEmployee.PositionOld = org.result.position; retirementResignEmployee.PositionLevelOld = org.result.posLevelName; retirementResignEmployee.PositionTypeOld = org.result.posTypeName; @@ -2337,7 +2337,8 @@ namespace BMA.EHR.Retirement.Service.Controllers { result.Add(r); string? _null = null; - if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") + { result.Add(new { No = _null, @@ -2520,7 +2521,8 @@ namespace BMA.EHR.Retirement.Service.Controllers { result.Add(r); string? _null = null; - if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") + { result.Add(new { No = _null,