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,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue