hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

add CommandExcecuteDate

Browse source
This commit is contained in:
Bright 2024-11-08 17:22:51 +07:00
parent 0f75dad798
commit 4970659f0a
5 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
BMA.EHR.Placement.Service/Controllers/PlacementController.cs
View file

@ -1576,6 +1576,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "-",
Salary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber().ToThaiNumber(),
AppointDate = p.ReportingDate == null ? "-" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
OccupationPosition = p.OccupationPosition == null ? "-" : p.OccupationPosition, //ตำแหน่งเก่าก่อนสอบ
PositionCandidate = p.positionName, //ตำแหน่งที่สอบแข่งขัน
OcCandidate = p.root == null ? p.PositionCandidate == null ? "-" : $"{p.PositionCandidate}/-" :
@ -1613,6 +1614,7 @@ namespace BMA.EHR.Placement.Service.Controllers
PositionNumber = _null,
Salary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
OccupationPosition = _null,
PositionCandidate = _null,
OcCandidate = _null,
@ -1887,6 +1889,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "-",
Salary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber().ToThaiNumber(),
AppointDate = p.ReportingDate == null ? "-" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
PositionCandidate = p.positionName,
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
@ -1912,6 +1915,7 @@ namespace BMA.EHR.Placement.Service.Controllers
PositionNumber = _null,
Salary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
OccupationPosition = _null,
PositionCandidate = _null,
RemarkHorizontal = _null,
@ -2206,6 +2210,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "-",
NewSalary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
AppointDate = p.ReportingDate == null ? "-" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
@ -2234,6 +2239,7 @@ namespace BMA.EHR.Placement.Service.Controllers
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
@ -2429,6 +2435,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "-",
NewSalary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
AppointDate = p.ReportingDate == null ? "-" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
@ -2457,6 +2464,7 @@ namespace BMA.EHR.Placement.Service.Controllers
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});