update placement and retire
This commit is contained in:
parent
b528f0a81d
commit
706edbd0f0
32 changed files with 282 additions and 32 deletions
|
|
@ -376,6 +376,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
posLevelRank = profile.posLevelRank,
|
||||
posExecutiveId = profile.posExecutiveId,
|
||||
posExecutiveName = profile.posExecutiveName,
|
||||
positionExecutiveField = profile.positionExecutiveField,
|
||||
positionArea = profile.positionArea,
|
||||
posNo = profile.posNo,
|
||||
CreatedFullName = FullName ?? "System Administrator",
|
||||
CreatedUserId = UserId ?? "",
|
||||
|
|
@ -419,6 +421,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
posLevelRank = profile.posLevelRank,
|
||||
posExecutiveId = profile.posExecutiveId,
|
||||
posExecutiveName = profile.posExecutiveName,
|
||||
positionExecutiveField = profile.positionExecutiveField,
|
||||
positionArea = profile.positionArea,
|
||||
posNo = profile.posNo,
|
||||
CreatedFullName = FullName ?? "System Administrator",
|
||||
CreatedUserId = UserId ?? "",
|
||||
|
|
@ -479,6 +483,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
posLevelRank = x.posLevelRank,
|
||||
posExecutiveId = x.posExecutiveId,
|
||||
posExecutiveName = x.posExecutiveName,
|
||||
positionExecutiveField = x.positionExecutiveField,
|
||||
positionArea = x.positionArea,
|
||||
posNo = x.posNo,
|
||||
})
|
||||
.ToListAsync();
|
||||
|
|
@ -574,6 +580,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
posLevelRank = profileOld.posLevelRank,
|
||||
posExecutiveId = profileOld.posExecutiveId,
|
||||
posExecutiveName = profileOld.posExecutiveName,
|
||||
positionExecutiveField = profileOld.positionExecutiveField,
|
||||
positionArea = profileOld.positionArea,
|
||||
posNo = profileOld.posNo,
|
||||
CreatedFullName = FullName ?? "System Administrator",
|
||||
CreatedUserId = UserId ?? "",
|
||||
|
|
@ -636,6 +644,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
posLevelRank = profileOld.posLevelRank,
|
||||
posExecutiveId = profileOld.posExecutiveId,
|
||||
posExecutiveName = profileOld.posExecutiveName,
|
||||
positionExecutiveField = profileOld.positionExecutiveField,
|
||||
positionArea = profileOld.positionArea,
|
||||
posNo = profileOld.posNo,
|
||||
CreatedFullName = FullName ?? "System Administrator",
|
||||
CreatedUserId = UserId ?? "",
|
||||
|
|
@ -681,6 +691,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
positionType = x.posTypeName,
|
||||
positionLevel = x.posLevelName,
|
||||
positionExecutive = x.posExecutiveName,
|
||||
positionExecutiveField = x.positionExecutiveField,
|
||||
positionArea = x.positionArea,
|
||||
posNo = x.posNo,
|
||||
})
|
||||
.ToListAsync();
|
||||
|
|
@ -791,6 +803,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
posTypeName = x.posTypeName,
|
||||
posLevelName = x.posLevelName,
|
||||
posExecutiveName = x.posExecutiveName,
|
||||
positionExecutiveField = x.positionExecutiveField,
|
||||
positionArea = x.positionArea,
|
||||
posNo = x.posNo,
|
||||
// positionEmployeePosition = x.Profile.PositionEmployeePosition == null ? null : x.Profile.PositionEmployeePosition.Name,
|
||||
// positionEmployeeLevel = x.Profile.PositionEmployeeLevel == null ? null : x.Profile.PositionEmployeeLevel.Name,
|
||||
|
|
@ -976,6 +990,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
data.posLevelRank = org.result.posLevelRank;
|
||||
data.posExecutiveId = org.result.posExecutiveId;
|
||||
data.posExecutiveName = org.result.posExecutiveName;
|
||||
data.positionExecutiveField = org.result.positionExecutiveField;
|
||||
data.positionArea = org.result.positionArea;
|
||||
data.posNo = org.result.posNo;
|
||||
|
||||
dataRaw.profileId = org.result.profileId;
|
||||
|
|
@ -1008,6 +1024,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
dataRaw.posLevelRank = org.result.posLevelRank;
|
||||
dataRaw.posExecutiveId = org.result.posExecutiveId;
|
||||
dataRaw.posExecutiveName = org.result.posExecutiveName;
|
||||
dataRaw.positionExecutiveField = org.result.positionExecutiveField;
|
||||
dataRaw.positionArea = org.result.positionArea;
|
||||
dataRaw.posNo = org.result.posNo;
|
||||
|
||||
_context.RetirementProfiles.Add(data);
|
||||
|
|
|
|||
|
|
@ -290,6 +290,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
retirementDeceased.posMasterNo = org.result.posMasterNo;
|
||||
retirementDeceased.position = org.result.position;
|
||||
retirementDeceased.PositionExecutiveOld = org.result.posExecutiveName;
|
||||
retirementDeceased.positionExecutiveFieldOld = org.result.positionExecutiveField;
|
||||
retirementDeceased.positionAreaOld = org.result.positionArea;
|
||||
retirementDeceased.posTypeId = org.result.posTypeId;
|
||||
retirementDeceased.posTypeName = $"{org.result.posTypeShortName} {org.result.posTypeName}";
|
||||
retirementDeceased.posLevelId = org.result.posLevelId;
|
||||
|
|
|
|||
|
|
@ -406,6 +406,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
retirementOther.LeaveDate = org.result.leaveDate;
|
||||
retirementOther.PositionOld = org.result.position;
|
||||
retirementOther.PositionExecutiveOld = org.result.posExecutiveName;
|
||||
retirementOther.positionExecutiveFieldOld = org.result.positionExecutiveField;
|
||||
retirementOther.positionAreaOld = org.result.positionArea;
|
||||
retirementOther.PositionLevelOld = org.result.posLevelName;
|
||||
retirementOther.PositionTypeOld = org.result.posTypeName;
|
||||
retirementOther.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
|
||||
|
|
@ -528,6 +530,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
uppdated.posMasterNo = req.posMasterNo;
|
||||
uppdated.position = req.positionName;
|
||||
uppdated.PositionExecutive = req.posExecutiveName;
|
||||
uppdated.positionExecutiveField = req.positionExecutiveField;
|
||||
uppdated.positionArea = req.positionArea;
|
||||
uppdated.positionField = req.positionField;
|
||||
uppdated.posTypeId = req.posTypeId;
|
||||
uppdated.posTypeName = req.posTypeName;
|
||||
|
|
@ -731,7 +735,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
|
||||
LeaveDate = p.LeaveDate == null ? "-" : p.LeaveDate.Value.ToThaiShortDate2().ToThaiNumber(),
|
||||
NewOc = (p.position == null ? "" : $"{p.position}\n") +
|
||||
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
|
||||
(p.PositionExecutive == null ? "" : (p.positionArea == null ? $"{p.positionExecutiveField}\n" : $"{p.PositionExecutive}({p.positionExecutiveField})\n")) +
|
||||
(p.child4 == null ? "" : $"{p.child4}\n") +
|
||||
(p.child3 == null ? "" : $"{p.child3}\n") +
|
||||
(p.child2 == null ? "" : $"{p.child2}\n") +
|
||||
|
|
@ -812,7 +816,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
positionExecutive = "",
|
||||
positionExecutive = p.PositionExecutiveOld,
|
||||
positionExecutiveField = p.positionExecutiveFieldOld,
|
||||
positionArea = p.positionAreaOld,
|
||||
positionType = p.PositionTypeOld,
|
||||
positionLevel = p.PositionLevelOld,
|
||||
isLeave = false,
|
||||
|
|
@ -973,7 +979,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
LeaveDate = p.LeaveDate == null ? "-" : p.LeaveDate.Value.ToThaiShortDate2().ToThaiNumber(),
|
||||
MilitaryDate = p.MilitaryDate == null ? "-" : p.MilitaryDate.Value.ToThaiShortDate2().ToThaiNumber(),
|
||||
NewOc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") +
|
||||
(p.PositionExecutiveOld == null ? "" : $"{p.PositionExecutiveOld}\n") +
|
||||
(p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
|
||||
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
|
||||
(p.child3Old == null ? "" : $"{p.child3Old}\n") +
|
||||
(p.child2Old == null ? "" : $"{p.child2Old}\n") +
|
||||
|
|
@ -1054,7 +1060,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
positionExecutive = "",
|
||||
positionExecutive = p.PositionExecutiveOld,
|
||||
positionExecutiveField = p.positionExecutiveFieldOld,
|
||||
positionArea = p.positionAreaOld,
|
||||
positionType = p.PositionTypeOld,
|
||||
positionLevel = p.PositionLevelOld,
|
||||
isLeave = false,
|
||||
|
|
|
|||
|
|
@ -300,6 +300,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
|
||||
retirementOut.PositionOld = org.result.position;
|
||||
retirementOut.PositionExecutiveOld = org.result.posExecutiveName;
|
||||
retirementOut.positionExecutiveFieldOld = org.result.positionExecutiveField;
|
||||
retirementOut.positionAreaOld = org.result.positionArea;
|
||||
retirementOut.PositionLevelOld = org.result.posLevelName;
|
||||
retirementOut.PositionTypeOld = org.result.posTypeName;
|
||||
retirementOut.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
|
||||
|
|
@ -562,7 +564,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
positionExecutive = "",
|
||||
positionExecutive = p.PositionExecutiveOld,
|
||||
positionExecutiveField = p.positionExecutiveFieldOld,
|
||||
positionArea = p.positionAreaOld,
|
||||
positionType = p.PositionTypeOld,
|
||||
positionLevel = p.PositionLevelOld,
|
||||
isLeave = true,
|
||||
|
|
|
|||
|
|
@ -1301,6 +1301,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
retirementResign.AmountOld = org.result.salary;
|
||||
retirementResign.PositionOld = org.result.position;
|
||||
retirementResign.PositionExecutiveOld = org.result.posExecutiveName;
|
||||
retirementResign.positionExecutiveFieldOld = org.result.positionExecutiveField;
|
||||
retirementResign.positionAreaOld = org.result.positionArea;
|
||||
retirementResign.PositionLevelOld = org.result.posLevelName;
|
||||
retirementResign.PositionTypeOld = org.result.posTypeName;
|
||||
retirementResign.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
|
||||
|
|
@ -2626,7 +2628,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
positionExecutive = "",
|
||||
positionExecutive = p.PositionExecutiveOld,
|
||||
positionExecutiveField = p.positionExecutiveFieldOld,
|
||||
positionArea = p.positionAreaOld,
|
||||
positionType = p.PositionTypeOld,
|
||||
positionLevel = p.PositionLevelOld,
|
||||
isLeave = p.IsCancel == true ? false : true,
|
||||
|
|
@ -2748,7 +2752,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
PositionName = p.PositionOld ?? "-",
|
||||
Organization = p.OrganizationPositionOld ?? "-",
|
||||
Oc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") +
|
||||
(p.PositionExecutiveOld == null ? "" : $"{p.PositionExecutiveOld}\n") +
|
||||
(p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
|
||||
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
|
||||
(p.child3Old == null ? "" : $"{p.child3Old}\n") +
|
||||
(p.child2Old == null ? "" : $"{p.child2Old}\n") +
|
||||
|
|
@ -2824,7 +2828,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
positionExecutive = "",
|
||||
positionExecutive = p.PositionExecutiveOld,
|
||||
positionExecutiveField = p.positionExecutiveFieldOld,
|
||||
positionArea = p.positionAreaOld,
|
||||
positionType = p.PositionTypeOld,
|
||||
positionLevel = p.PositionLevelOld,
|
||||
isLeave = false,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue