แก้ report เกษียณ

This commit is contained in:
Kittapath 2023-10-12 04:46:44 +07:00
parent fb6e71c60c
commit 21aabd2ec3
9 changed files with 33 additions and 14 deletions

View file

@ -1782,26 +1782,32 @@ namespace BMA.EHR.Application.Repositories.Commands
RegistrationSubDistrictId = placementProfile.RegistSubDistrict == null ? Guid.Empty : placementProfile.RegistSubDistrict!.Id,
RegistrationDistrictId = placementProfile.RegistDistrict == null ? Guid.Empty : placementProfile.RegistDistrict!.Id,
RegistrationProvinceId = placementProfile.RegistProvince == null ? Guid.Empty : placementProfile.RegistProvince!.Id,
RegistrationZipCode = placementProfile.RegistSubDistrict == null ? null : placementProfile.RegistSubDistrict!.ZipCode,
CurrentAddress = placementProfile.CurrentAddress,
CurrentSubDistrictId = placementProfile.CurrentSubDistrict == null ? Guid.Empty : placementProfile.CurrentSubDistrict!.Id,
CurrentDistrictId = placementProfile.CurrentDistrict == null ? Guid.Empty : placementProfile.CurrentDistrict!.Id,
CurrentProvinceId = placementProfile.CurrentProvince == null ? Guid.Empty : placementProfile.CurrentProvince!.Id,
CurrentZipCode = placementProfile.CurrentSubDistrict == null ? null : placementProfile.CurrentSubDistrict!.ZipCode,
FatherPrefixId = placementProfile.FatherPrefix == null ? Guid.Empty : placementProfile.FatherPrefix.Id,
FatherPrefixId = placementProfile.FatherPrefix == null ? null : placementProfile.FatherPrefix.Id,
FatherFirstName = placementProfile.FatherFirstName,
FatherLastName = placementProfile.FatherLastName,
FatherCareer = placementProfile.FatherOccupation,
FatherLive = true,
MotherPrefixId = placementProfile.MotherPrefix == null ? Guid.Empty : placementProfile.MotherPrefix.Id,
MotherPrefixId = placementProfile.MotherPrefix == null ? null : placementProfile.MotherPrefix.Id,
MotherFirstName = placementProfile.MotherFirstName,
MotherLastName = placementProfile.MotherLastName,
MotherCareer = placementProfile.MotherOccupation,
MotherLive = true,
CouplePrefixId = placementProfile.MarryPrefix == null ? Guid.Empty : placementProfile.MarryPrefix.Id,
Couple = placementProfile.MarryPrefix == null ? false : true,
CouplePrefixId = placementProfile.MarryPrefix == null ? null : placementProfile.MarryPrefix.Id,
CoupleFirstName = placementProfile.MarryFirstName,
CoupleLastName = placementProfile.MarryLastName,
CoupleCareer = placementProfile.MarryOccupation,
CoupleLive = placementProfile.MarryPrefix == null ? false : true,
Position = placementProfile.PositionPath,
PositionPathSideId = placementProfile.PositionPathSide == null ? Guid.Empty : placementProfile.PositionPathSide.Id,
@ -1826,9 +1832,9 @@ namespace BMA.EHR.Application.Repositories.Commands
VerifiedUser = "",
FirstNameOld = "",
LastNameOld = "",
CoupleLive = false,
FatherLive = false,
MotherLive = false,
// CoupleLive = false,
// FatherLive = false,
// MotherLive = false,
CreatedUser = "",
Educations = new List<ProfileEducation>(),
@ -4864,7 +4870,7 @@ namespace BMA.EHR.Application.Repositories.Commands
//data.Profile.IsActive = false;
//data.Profile.IsLeave = true;
//data.Profile.LeaveReason = "ออกจากราชการ";
//data.Profile.LeaveReason = "ลาออกจากราชการ";
//data.Profile.LeaveDate = command.CommandAffectDate;
var lastSarary = data.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault();
@ -5043,7 +5049,7 @@ namespace BMA.EHR.Application.Repositories.Commands
//data.Profile.IsActive = false;
//data.Profile.IsLeave = true;
//data.Profile.LeaveReason = "ออกจากราชการ";
//data.Profile.LeaveReason = "ลาออกจากราชการ";
//data.Profile.LeaveDate = command.CommandAffectDate;
var lastSarary = data.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault();
@ -5222,7 +5228,7 @@ namespace BMA.EHR.Application.Repositories.Commands
data.Profile.IsActive = false;
data.Profile.IsLeave = true;
data.Profile.LeaveReason = "ออกจากราชการ";
data.Profile.LeaveReason = "ลาออกจากราชการ";
data.Profile.LeaveDate = command.CommandAffectDate;
var lastSarary = data.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault();
@ -6315,7 +6321,7 @@ namespace BMA.EHR.Application.Repositories.Commands
data.Profile.IsActive = false;
data.Profile.IsLeave = true;
data.Profile.LeaveReason = "ออกจากราชการ";
data.Profile.LeaveReason = "ลาออกจากราชการ";
data.Profile.LeaveDate = command.CommandAffectDate;
var lastSarary = data.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault();