หมายเหตุลาออก
Some checks failed
release-dev / release-dev (push) Failing after 13s

This commit is contained in:
kittapath 2024-12-13 21:39:00 +07:00
parent 5f92b0c536
commit 58f7ab83e3
11 changed files with 19359 additions and 0 deletions

View file

@ -149,6 +149,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.SendDate,
p.ActiveDate,
p.Reason,
p.Remark,
p.ApproveReason,
p.RejectReason,
p.CancelReason,
@ -197,6 +198,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.SendDate,
p.ActiveDate,
p.Reason,
p.Remark,
p.ApproveReason,
p.RejectReason,
p.CancelReason,
@ -241,6 +243,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.SendDate,
p.ActiveDate,
p.Reason,
p.Remark,
p.Status,
salary = p.AmountOld,
p.PositionTypeOld,
@ -292,6 +295,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.SendDate,
p.ActiveDate,
p.Reason,
p.Remark,
p.Status,
salary = p.AmountOld,
p.PositionTypeOld,
@ -362,6 +366,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.SendDate,
p.ActiveDate,
p.Reason,
p.Remark,
p.Status,
salary = p.AmountOld,
p.ApproveReason,
@ -453,6 +458,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.SendDate,
data.ActiveDate,
data.Reason,
data.Remark,
data.Status,
data.salary,
data.PositionTypeOld,
@ -540,6 +546,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.SendDate,
p.ActiveDate,
p.Reason,
p.Remark,
p.Status,
salary = p.AmountOld,
p.ApproveReason,
@ -619,6 +626,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.SendDate,
data.ActiveDate,
data.Reason,
data.Remark,
data.Status,
data.salary,
data.PositionTypeOld,
@ -716,6 +724,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.SendDate,
p.ActiveDate,
p.Reason,
p.Remark,
p.Status,
salary = p.AmountOld,
p.ApproveReason,
@ -795,6 +804,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.SendDate,
data.ActiveDate,
data.Reason,
data.Remark,
data.Status,
data.salary,
data.PositionTypeOld,
@ -881,6 +891,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
SendDate = DateTime.Now,
ActiveDate = req.ActiveDate,
Reason = req.Reason,
Remark = req.Remark,
// AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount,
// PositionLevelOld = profile.PositionLevel == null ? null : profile.PositionLevel.Name,
// PositionTypeOld = profile.PositionType == null ? null : profile.PositionType.Name,
@ -1018,6 +1029,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
updated.Location = req.Location;
updated.ActiveDate = req.ActiveDate;
updated.Reason = req.Reason;
updated.Remark = req.Remark;
updated.OrganizationPositionOld = req.OrganizationPositionOld;
updated.RemarkHorizontal = req.RemarkHorizontal;
updated.PositionTypeOld = req.PositionTypeOld;
@ -1050,6 +1062,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
updated.Location = req.Location;
updated.ActiveDate = req.ActiveDate;
updated.Reason = req.Reason;
updated.Remark = req.Remark;
updated.OrganizationPositionOld = req.OrganizationPositionOld;
updated.RemarkHorizontal = req.RemarkHorizontal;
updated.PositionTypeOld = req.PositionTypeOld;
@ -1168,6 +1181,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
SendDate = updated.SendDate,
ActiveDate = updated.ActiveDate,
Reason = updated.Reason,
Remark = updated.Remark,
OrganizationPositionOld = updated.OrganizationPositionOld,
PositionTypeOld = updated.PositionTypeOld,
PositionLevelOld = updated.PositionLevelOld,

View file

@ -93,6 +93,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.SendDate,
p.ActiveDate,
p.Reason,
p.Remark,
p.ApproveReason,
p.RejectReason,
p.CancelReason,
@ -141,6 +142,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.SendDate,
p.ActiveDate,
p.Reason,
p.Remark,
p.ApproveReason,
p.RejectReason,
p.CancelReason,
@ -185,6 +187,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.SendDate,
p.ActiveDate,
p.Reason,
p.Remark,
p.Status,
salary = p.AmountOld,
p.PositionTypeOld,
@ -306,6 +309,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.SendDate,
p.ActiveDate,
p.Reason,
p.Remark,
p.Status,
salary = p.AmountOld,
p.ApproveReason,
@ -397,6 +401,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.SendDate,
data.ActiveDate,
data.Reason,
data.Remark,
data.Status,
data.salary,
data.PositionTypeOld,
@ -484,6 +489,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.SendDate,
p.ActiveDate,
p.Reason,
p.Remark,
p.Status,
salary = p.AmountOld,
p.ApproveReason,
@ -563,6 +569,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.SendDate,
data.ActiveDate,
data.Reason,
data.Remark,
data.Status,
data.salary,
data.PositionTypeOld,
@ -660,6 +667,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.SendDate,
p.ActiveDate,
p.Reason,
p.Remark,
p.Status,
salary = p.AmountOld,
p.ApproveReason,
@ -739,6 +747,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.SendDate,
data.ActiveDate,
data.Reason,
data.Remark,
data.Status,
data.salary,
data.PositionTypeOld,
@ -825,6 +834,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
SendDate = DateTime.Now,
ActiveDate = req.ActiveDate,
Reason = req.Reason,
Remark = req.Remark,
// AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount,
// PositionLevelOld = profile.PositionLevel == null ? null : profile.PositionLevel.Name,
// PositionTypeOld = profile.PositionType == null ? null : profile.PositionType.Name,
@ -962,6 +972,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
updated.Location = req.Location;
updated.ActiveDate = req.ActiveDate;
updated.Reason = req.Reason;
updated.Remark = req.Remark;
updated.OrganizationPositionOld = req.OrganizationPositionOld;
updated.RemarkHorizontal = req.RemarkHorizontal;
updated.PositionTypeOld = req.PositionTypeOld;
@ -994,6 +1005,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
updated.Location = req.Location;
updated.ActiveDate = req.ActiveDate;
updated.Reason = req.Reason;
updated.Remark = req.Remark;
updated.OrganizationPositionOld = req.OrganizationPositionOld;
updated.RemarkHorizontal = req.RemarkHorizontal;
updated.PositionTypeOld = req.PositionTypeOld;
@ -1112,6 +1124,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
SendDate = updated.SendDate,
ActiveDate = updated.ActiveDate,
Reason = updated.Reason,
Remark = updated.Remark,
OrganizationPositionOld = updated.OrganizationPositionOld,
PositionTypeOld = updated.PositionTypeOld,
PositionLevelOld = updated.PositionLevelOld,