update placement and retire
This commit is contained in:
parent
b528f0a81d
commit
706edbd0f0
32 changed files with 282 additions and 32 deletions
|
|
@ -969,6 +969,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
person.posMasterNo = req.posMasterNo;
|
||||
person.positionName = req.positionName;
|
||||
person.PositionExecutive = req.posExecutiveName;
|
||||
person.positionExecutiveField = req.positionExecutiveField;
|
||||
person.positionArea = req.positionArea;
|
||||
person.positionField = req.positionField;
|
||||
person.posTypeId = req.posTypeId;
|
||||
person.posTypeName = req.posTypeName;
|
||||
|
|
@ -1630,7 +1632,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
ExamNumber = p.ExamNumber == null ? "-" : p.ExamNumber.Value.ToString().ToThaiNumber(),
|
||||
PlacementName = $"{p.Placement.Name.ToThaiNumber()} ครั้งที่ {p.Placement.Round.ToThaiNumber()} {p.Placement.Year.ToThaiYear().ToString().ToThaiNumber()}",
|
||||
Oc = (p.positionName == null ? "" : $"{p.positionName}\n") +
|
||||
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
|
||||
(p.PositionExecutive == null ? "" : (p.positionExecutiveField == null ? $"{p.PositionExecutive}\n" : $"{p.PositionExecutive}({p.positionExecutiveField})\n")) +
|
||||
(p.child4 == null ? "" : $"{p.child4}\n") +
|
||||
(p.child3 == null ? "" : $"{p.child3}\n") +
|
||||
(p.child2 == null ? "" : $"{p.child2}\n") +
|
||||
|
|
@ -1806,7 +1808,9 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
positionExecutive = "",
|
||||
positionExecutive = p.PositionExecutive,
|
||||
positionExecutiveField = p.positionExecutiveField,
|
||||
positionArea = p.positionArea,
|
||||
positionType = p.posTypeName,
|
||||
positionLevel = p.posLevelName,
|
||||
commandId = r.commandId,
|
||||
|
|
@ -1986,7 +1990,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
ExamNumber = p.ExamNumber == null ? "-" : p.ExamNumber.Value.ToString().ToThaiNumber(),
|
||||
PlacementName = $"{p.Placement.Name.ToThaiNumber()} ครั้งที่ {p.Placement.Round.ToThaiNumber()} {p.Placement.Year.ToThaiYear().ToString().ToThaiNumber()}",
|
||||
Oc = (p.positionName == null ? "" : $"{p.positionName}\n") +
|
||||
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
|
||||
(p.PositionExecutive == null ? "" : (p.positionExecutiveField == null ? $"{p.PositionExecutive}\n" : $"{p.PositionExecutive}({p.positionExecutiveField})\n")) +
|
||||
(p.child4 == null ? "" : $"{p.child4}\n") +
|
||||
(p.child3 == null ? "" : $"{p.child3}\n") +
|
||||
(p.child2 == null ? "" : $"{p.child2}\n") +
|
||||
|
|
@ -2154,7 +2158,9 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
positionExecutive = "",
|
||||
positionExecutive = p.PositionExecutive,
|
||||
positionExecutiveField = p.positionExecutiveField,
|
||||
positionArea = p.positionArea,
|
||||
positionType = p.posTypeName,
|
||||
positionLevel = p.posLevelName,
|
||||
commandId = r.commandId,
|
||||
|
|
@ -2335,7 +2341,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
|
||||
p.PlacementEducations.FirstOrDefault().Degree,
|
||||
OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\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") +
|
||||
|
|
@ -2352,7 +2358,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
|
||||
OldPosition = p.positionNameOld == null ? "-" : p.positionNameOld,
|
||||
NewOc = (p.positionName == null ? "" : $"{p.positionName}\n") +
|
||||
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
|
||||
(p.PositionExecutive == null ? "" : (p.positionExecutiveField == null ? $"{p.PositionExecutive}\n" : $"{p.PositionExecutive}({p.positionExecutiveField})\n")) +
|
||||
(p.child4 == null ? "" : $"{p.child4}\n") +
|
||||
(p.child3 == null ? "" : $"{p.child3}\n") +
|
||||
(p.child2 == null ? "" : $"{p.child2}\n") +
|
||||
|
|
@ -2438,7 +2444,9 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
positionExecutive = "",
|
||||
positionExecutive = p.PositionExecutive,
|
||||
positionExecutiveField = p.positionExecutiveField,
|
||||
positionArea = p.positionArea,
|
||||
positionType = p.posTypeName,
|
||||
positionLevel = p.posLevelName,
|
||||
posmasterId = p.posmasterId,
|
||||
|
|
@ -2567,7 +2575,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
|
||||
p.PlacementEducations.FirstOrDefault().Degree,
|
||||
OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\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") +
|
||||
|
|
@ -2584,7 +2592,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.nodeOld == "0" ? $"{p.rootShortNameOld} {p.posMasterNoOld}".ToThaiNumber() : "-",
|
||||
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
|
||||
NewOc = (p.positionName == null ? "" : $"{p.positionName}\n") +
|
||||
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
|
||||
(p.PositionExecutive == null ? "" : (p.positionExecutiveField == null ? $"{p.PositionExecutive}\n" : $"{p.PositionExecutive}({p.positionExecutiveField})\n")) +
|
||||
(p.child4 == null ? "" : $"{p.child4}\n") +
|
||||
(p.child3 == null ? "" : $"{p.child3}\n") +
|
||||
(p.child2 == null ? "" : $"{p.child2}\n") +
|
||||
|
|
@ -2670,7 +2678,9 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
positionExecutive = "",
|
||||
positionExecutive = p.PositionExecutive,
|
||||
positionExecutiveField = p.positionExecutiveField,
|
||||
positionArea = p.positionArea,
|
||||
positionType = p.posTypeName,
|
||||
positionLevel = p.posLevelName,
|
||||
posmasterId = p.posmasterId,
|
||||
|
|
@ -2788,7 +2798,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
|
||||
p.PlacementEducations.FirstOrDefault().Degree,
|
||||
OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\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") +
|
||||
|
|
@ -2805,7 +2815,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
OldSalary = p.Amount == null ? "-" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
|
||||
LeaveDate = "-",
|
||||
NewOc = (p.positionName == null ? "" : $"{p.positionName}\n") +
|
||||
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
|
||||
(p.PositionExecutive == null ? "" : (p.positionExecutiveField == null ? $"{p.PositionExecutive}\n" : $"{p.PositionExecutive}({p.positionExecutiveField})\n")) +
|
||||
(p.child4 == null ? "" : $"{p.child4}\n") +
|
||||
(p.child3 == null ? "" : $"{p.child3}\n") +
|
||||
(p.child2 == null ? "" : $"{p.child2}\n") +
|
||||
|
|
@ -2887,7 +2897,9 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
amountSpecial = r.amountSpecial,
|
||||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
positionExecutive = "",
|
||||
positionExecutive = p.PositionExecutive,
|
||||
positionExecutiveField = p.positionExecutiveField,
|
||||
positionArea = p.positionArea,
|
||||
positionType = p.posTypeName,
|
||||
positionLevel = p.posLevelName,
|
||||
posmasterId = p.posmasterId,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue