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

แก้ไขหมาย้หตุคำสั่ง

Browse source
This commit is contained in:
Kittapath 2023-10-02 19:51:38 +07:00
parent a76ba4270f
commit ccf19c5683
21 changed files with 16530 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Retirement.Service/Controllers/RetirementDischargeController.cs
View file

@ -189,7 +189,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
Organization = Request.Form.ContainsKey("Organization") ? Request.Form["Organization"] : "",
Reason = Request.Form.ContainsKey("Reason") ? Request.Form["Reason"] : "",
// Date = req.Date,
AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().PositionSalaryAmount,
AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount,
PositionLevelOld = profile.PositionLevel == null ? null : profile.PositionLevel.Name,
PositionTypeOld = profile.PositionType == null ? null : profile.PositionType.Name,
PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name,

2
BMA.EHR.Retirement.Service/Controllers/RetirementExpulsionController.cs
View file

@ -189,7 +189,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
Organization = Request.Form.ContainsKey("Organization") ? Request.Form["Organization"] : "",
Reason = Request.Form.ContainsKey("Reason") ? Request.Form["Reason"] : "",
// Date = req.Date,
AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().PositionSalaryAmount,
AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount,
PositionLevelOld = profile.PositionLevel == null ? null : profile.PositionLevel.Name,
PositionTypeOld = profile.PositionType == null ? null : profile.PositionType.Name,
PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name,

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

@ -94,6 +94,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.IsActive,
p.PositionDate,
p.Reason,
p.MilitaryDate,
p.EducationOld,
p.AmountOld,
p.PositionTypeOld,
@ -153,6 +154,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
OrganizationPositionId = p.OrganizationPosition == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OrganizationPosition.Id,
p.CreatedAt,
p.Reason,
p.MilitaryDate,
p.EducationOld,
p.AmountOld,
p.PositionTypeOld,
@ -207,6 +209,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.OrganizationPositionId,
data.CreatedAt,
data.Reason,
data.MilitaryDate,
data.EducationOld,
data.AmountOld,
data.PositionTypeOld,
@ -262,7 +265,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
Relationship = await _context.Relationships.FindAsync(profile.RelationshipId),
TelephoneNumber = profile.TelephoneNumber,
EducationOld = profile.Educations.Count() == 0 ? null : $"{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Degree}-{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Field}",
AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().PositionSalaryAmount,
AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount,
PositionLevelOld = profile.PositionLevel == null ? null : profile.PositionLevel.Name,
PositionTypeOld = profile.PositionType == null ? null : profile.PositionType.Name,
PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name,
@ -460,6 +463,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
uppdated.TelephoneNumber = req.TelephoneNumber;
uppdated.EducationOld = req.EducationOld;
uppdated.Reason = req.Reason;
uppdated.MilitaryDate = req.MilitaryDate;
uppdated.OrganizationPositionOld = req.OrganizationPositionOld;
uppdated.PositionTypeOld = req.PositionTypeOld;
uppdated.PositionLevelOld = req.PositionLevelOld;

2
BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
View file

@ -189,7 +189,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
Organization = Request.Form.ContainsKey("Organization") ? Request.Form["Organization"] : "",
Reason = Request.Form.ContainsKey("Reason") ? Request.Form["Reason"] : "",
// Date = req.Date,
AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().PositionSalaryAmount,
AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount,
PositionLevelOld = profile.PositionLevel == null ? null : profile.PositionLevel.Name,
PositionTypeOld = profile.PositionType == null ? null : profile.PositionType.Name,
PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name,

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

@ -310,7 +310,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
SendDate = req.SendDate,
ActiveDate = req.ActiveDate,
Reason = req.Reason,
AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().PositionSalaryAmount,
AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount,
PositionLevelOld = profile.PositionLevel == null ? null : profile.PositionLevel.Name,
PositionTypeOld = profile.PositionType == null ? null : profile.PositionType.Name,
PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name,

1
BMA.EHR.Retirement.Service/Requests/RetirementOtherEditRequest.cs
View file

@ -26,5 +26,6 @@ namespace BMA.EHR.Retirement.Service.Requests
public double? Amount { get; set; }
public double? AmountOld { get; set; }
public DateTime? PositionDate { get; set; }
public DateTime? MilitaryDate { get; set; }
}
}