update placement and retire
This commit is contained in:
parent
b528f0a81d
commit
706edbd0f0
32 changed files with 282 additions and 32 deletions
|
|
@ -118,6 +118,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.posMasterNo,
|
||||
p.position,
|
||||
p.PositionExecutive,
|
||||
p.positionExecutiveField,
|
||||
p.positionArea,
|
||||
p.positionField,
|
||||
p.posTypeId,
|
||||
p.posTypeName,
|
||||
|
|
@ -167,6 +169,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.posmasterId,
|
||||
p.positionOld,
|
||||
p.PositionExecutiveOld,
|
||||
p.positionExecutiveFieldOld,
|
||||
p.positionAreaOld,
|
||||
p.CreatedAt,
|
||||
p.typeCommand,
|
||||
})
|
||||
|
|
@ -229,6 +233,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.posMasterNo,
|
||||
p.position,
|
||||
p.PositionExecutive,
|
||||
p.positionExecutiveField,
|
||||
p.positionArea,
|
||||
p.positionField,
|
||||
p.posTypeId,
|
||||
p.posTypeName,
|
||||
|
|
@ -273,6 +279,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.OrganizationOld,
|
||||
p.positionOld,
|
||||
p.PositionExecutiveOld,
|
||||
p.positionExecutiveFieldOld,
|
||||
p.positionAreaOld,
|
||||
p.typeCommand,
|
||||
p.posmasterId,
|
||||
})
|
||||
|
|
@ -311,6 +319,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
data.posMasterNo,
|
||||
data.position,
|
||||
data.PositionExecutive,
|
||||
data.positionExecutiveField,
|
||||
data.positionArea,
|
||||
data.positionField,
|
||||
data.posTypeId,
|
||||
data.posTypeName,
|
||||
|
|
@ -359,6 +369,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
organizationOld = data.OrganizationOld == "/" || data.OrganizationOld == null ? null : data.OrganizationOld,
|
||||
data.positionOld,
|
||||
data.PositionExecutiveOld,
|
||||
data.positionExecutiveFieldOld,
|
||||
data.positionAreaOld,
|
||||
// Docs = placementAppointmentDocs,
|
||||
data.typeCommand,
|
||||
data.posmasterId,
|
||||
|
|
@ -455,6 +467,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
|
||||
placementAppointment.positionOld = org.result.position;
|
||||
placementAppointment.PositionExecutiveOld = org.result.posExecutiveName;
|
||||
placementAppointment.positionExecutiveFieldOld = org.result.positionExecutiveField;
|
||||
placementAppointment.positionAreaOld = org.result.positionArea;
|
||||
placementAppointment.PositionLevelOld = org.result.posLevelName;
|
||||
placementAppointment.PositionTypeOld = org.result.posTypeName;
|
||||
placementAppointment.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
|
||||
|
|
@ -577,6 +591,8 @@ namespace BMA.EHR.Placement.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;
|
||||
|
|
@ -822,7 +838,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
|
||||
LeaveDate = "-",
|
||||
NewOc = (p.position == null ? "" : $"{p.position}\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") +
|
||||
|
|
@ -907,6 +923,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
positionExecutive = p.PositionExecutive,
|
||||
positionExecutiveField = p.positionExecutiveField,
|
||||
positionArea = p.positionArea,
|
||||
positionType = p.posTypeName,
|
||||
positionLevel = p.posLevelName,
|
||||
posmasterId = p.posmasterId,
|
||||
|
|
@ -1032,7 +1050,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
|
||||
LeaveDate = "-",
|
||||
NewOc = (p.position == null ? "" : $"{p.position}\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") +
|
||||
|
|
@ -1117,6 +1135,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
positionExecutive = p.PositionExecutive,
|
||||
positionExecutiveField = p.positionExecutiveField,
|
||||
positionArea = p.positionArea,
|
||||
positionType = p.posTypeName,
|
||||
positionLevel = p.posLevelName,
|
||||
posmasterId = p.posmasterId,
|
||||
|
|
@ -1242,7 +1262,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),
|
||||
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
|
||||
NewOc = (p.position == null ? "" : $"{p.position}\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") +
|
||||
|
|
@ -1446,7 +1466,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.rootOld != null ? $"{p.rootShortNameOld} {p.posMasterNoOld}".ToThaiNumber() : "-",
|
||||
OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
|
||||
NewOc = (p.position == null ? "" : $"{p.position}\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") +
|
||||
|
|
@ -1660,7 +1680,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
|
||||
PositionDate = p.PositionDate == null ? "-" : p.PositionDate.Value.ToThaiShortDate2().ToThaiNumber(),
|
||||
NewOc = (p.position == null ? "" : $"{p.position}\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") +
|
||||
|
|
@ -1744,6 +1764,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
positionSalaryAmount = r.positionSalaryAmount,
|
||||
mouthSalaryAmount = r.mouthSalaryAmount,
|
||||
positionExecutive = p.PositionExecutive,
|
||||
positionExecutiveField = p.positionExecutiveField,
|
||||
positionArea = p.positionArea,
|
||||
positionType = p.posTypeName,
|
||||
positionLevel = p.posLevelName,
|
||||
posmasterId = p.posmasterId,
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -113,6 +113,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.child4ShortNameOld,
|
||||
p.PositionOld,
|
||||
p.PositionExecutiveOld,
|
||||
p.positionExecutiveFieldOld,
|
||||
p.positionAreaOld,
|
||||
p.posMasterNoOld,
|
||||
p.posTypeOldId,
|
||||
p.posTypeNameOld,
|
||||
|
|
@ -185,6 +187,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.child4ShortNameOld,
|
||||
p.PositionOld,
|
||||
p.PositionExecutiveOld,
|
||||
p.positionExecutiveFieldOld,
|
||||
p.positionAreaOld,
|
||||
p.posMasterNoOld,
|
||||
p.posTypeOldId,
|
||||
p.posTypeNameOld,
|
||||
|
|
@ -243,6 +247,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.child4ShortNameOld,
|
||||
p.PositionOld,
|
||||
p.PositionExecutiveOld,
|
||||
p.positionExecutiveFieldOld,
|
||||
p.positionAreaOld,
|
||||
p.posMasterNoOld,
|
||||
p.posTypeOldId,
|
||||
p.posTypeNameOld,
|
||||
|
|
@ -323,6 +329,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.OrganizationPositionOld,
|
||||
p.PositionOld,
|
||||
p.PositionExecutiveOld,
|
||||
p.positionExecutiveFieldOld,
|
||||
p.positionAreaOld,
|
||||
p.OrganizationOld,
|
||||
p.IsActive,
|
||||
})
|
||||
|
|
@ -403,6 +411,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
|
||||
placementOfficer.PositionOld = org.result.position;
|
||||
placementOfficer.PositionExecutiveOld = org.result.posExecutiveName;
|
||||
placementOfficer.positionExecutiveFieldOld = org.result.positionExecutiveField;
|
||||
placementOfficer.positionAreaOld = org.result.positionArea;
|
||||
placementOfficer.PositionLevelOld = org.result.posLevelName;
|
||||
placementOfficer.PositionTypeOld = org.result.posTypeName;
|
||||
placementOfficer.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
|
||||
|
|
@ -678,7 +688,9 @@ namespace BMA.EHR.Placement.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,
|
||||
commandId = r.commandId,
|
||||
|
|
|
|||
|
|
@ -157,6 +157,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.posMasterNoOld,
|
||||
p.PositionOld,
|
||||
p.PositionExecutiveOld,
|
||||
p.positionExecutiveFieldOld,
|
||||
p.positionAreaOld,
|
||||
p.posTypeOldId,
|
||||
p.posTypeNameOld,
|
||||
p.posLevelOldId,
|
||||
|
|
@ -244,6 +246,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.AmountOld,
|
||||
p.PositionOld,
|
||||
p.PositionExecutiveOld,
|
||||
p.positionExecutiveFieldOld,
|
||||
p.positionAreaOld,
|
||||
p.OrganizationOld,
|
||||
p.PositionTypeOld,
|
||||
p.PositionLevelOld,
|
||||
|
|
@ -343,6 +347,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
data.AmountOld,
|
||||
data.PositionOld,
|
||||
data.PositionExecutiveOld,
|
||||
data.positionExecutiveFieldOld,
|
||||
data.positionAreaOld,
|
||||
organizationOld = data.OrganizationOld == "/" || data.OrganizationOld == null ? null : data.OrganizationOld,
|
||||
data.PositionTypeOld,
|
||||
data.PositionLevelOld,
|
||||
|
|
@ -498,6 +504,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
|
||||
placementReceive.PositionOld = org.result.position;
|
||||
placementReceive.PositionExecutiveOld = org.result.posExecutiveName;
|
||||
placementReceive.positionExecutiveFieldOld = org.result.positionExecutiveField;
|
||||
placementReceive.positionAreaOld = org.result.positionArea;
|
||||
placementReceive.PositionLevelOld = org.result.posLevelName;
|
||||
placementReceive.PositionTypeOld = org.result.posTypeName;
|
||||
placementReceive.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
|
||||
|
|
@ -674,6 +682,8 @@ namespace BMA.EHR.Placement.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;
|
||||
|
|
@ -941,7 +951,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
Education = p.EducationOld == null ? "-" : p.EducationOld,
|
||||
OldOrg = p.OrganizationPositionOld ?? "-",
|
||||
OldOc = (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") +
|
||||
|
|
@ -951,7 +961,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
OldPositionLevel = p.PositionLevelOld ?? "-",
|
||||
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
|
||||
NewOc = (p.position == null ? "" : $"{p.position}\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") +
|
||||
|
|
@ -1078,7 +1088,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,
|
||||
|
|
|
|||
|
|
@ -114,6 +114,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.child4ShortNameOld,
|
||||
p.PositionOld,
|
||||
p.PositionExecutiveOld,
|
||||
p.positionExecutiveFieldOld,
|
||||
p.positionAreaOld,
|
||||
p.posMasterNoOld,
|
||||
p.posTypeOldId,
|
||||
p.posTypeNameOld,
|
||||
|
|
@ -201,6 +203,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.OrganizationPositionOld,
|
||||
p.PositionOld,
|
||||
p.PositionExecutiveOld,
|
||||
p.positionExecutiveFieldOld,
|
||||
p.positionAreaOld,
|
||||
p.DateRepatriation,
|
||||
})
|
||||
.FirstOrDefaultAsync();
|
||||
|
|
@ -289,6 +293,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
|
||||
placementRepatriation.PositionOld = org.result.position;
|
||||
placementRepatriation.PositionExecutiveOld = org.result.posExecutiveName;
|
||||
placementRepatriation.positionExecutiveFieldOld = org.result.positionExecutiveField;
|
||||
placementRepatriation.positionAreaOld = org.result.positionArea;
|
||||
placementRepatriation.PositionLevelOld = org.result.posLevelName;
|
||||
placementRepatriation.PositionTypeOld = org.result.posTypeName;
|
||||
placementRepatriation.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
|
||||
|
|
@ -550,7 +556,9 @@ namespace BMA.EHR.Placement.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,
|
||||
commandId = r.commandId,
|
||||
|
|
|
|||
|
|
@ -207,6 +207,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.child4ShortNameOld,
|
||||
p.PositionOld,
|
||||
p.PositionExecutiveOld,
|
||||
p.positionExecutiveFieldOld,
|
||||
p.positionAreaOld,
|
||||
p.posMasterNoOld,
|
||||
p.posTypeOldId,
|
||||
p.posTypeNameOld,
|
||||
|
|
@ -283,6 +285,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.OrganizationPositionOld,
|
||||
p.PositionOld,
|
||||
p.PositionExecutiveOld,
|
||||
p.positionExecutiveFieldOld,
|
||||
p.positionAreaOld,
|
||||
PlacementTransferDocs = p.PlacementTransferDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
|
||||
})
|
||||
.FirstOrDefaultAsync();
|
||||
|
|
@ -338,6 +342,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
data.OrganizationPositionOld,
|
||||
data.PositionOld,
|
||||
data.PositionExecutiveOld,
|
||||
data.positionExecutiveFieldOld,
|
||||
data.positionAreaOld,
|
||||
Docs = placementTransferDocs,
|
||||
};
|
||||
|
||||
|
|
@ -407,6 +413,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.OrganizationPositionOld,
|
||||
p.PositionOld,
|
||||
p.PositionExecutiveOld,
|
||||
p.positionExecutiveFieldOld,
|
||||
p.positionAreaOld,
|
||||
PlacementTransferDocs = p.PlacementTransferDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
|
||||
})
|
||||
.FirstOrDefaultAsync();
|
||||
|
|
@ -462,6 +470,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
data.OrganizationPositionOld,
|
||||
data.PositionOld,
|
||||
data.PositionExecutiveOld,
|
||||
data.positionExecutiveFieldOld,
|
||||
data.positionAreaOld,
|
||||
Docs = placementTransferDocs,
|
||||
};
|
||||
|
||||
|
|
@ -538,6 +548,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
placementTransfer.AmountOld = org.result.salary;
|
||||
placementTransfer.PositionOld = org.result.position;
|
||||
placementTransfer.PositionExecutiveOld = org.result.posExecutiveName;
|
||||
placementTransfer.positionExecutiveFieldOld = org.result.positionExecutiveField;
|
||||
placementTransfer.positionAreaOld = org.result.positionArea;
|
||||
placementTransfer.PositionLevelOld = org.result.posLevelName;
|
||||
placementTransfer.PositionTypeOld = org.result.posTypeName;
|
||||
placementTransfer.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
|
||||
|
|
@ -877,7 +889,9 @@ namespace BMA.EHR.Placement.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,
|
||||
commandId = r.commandId,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue