This commit is contained in:
kittapath
parent
549bbfcf52
commit
a6b256a39c
9 changed files with 19284 additions and 4 deletions
|
|
@ -149,6 +149,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
p.SendDate,
|
||||
p.ActiveDate,
|
||||
p.Reason,
|
||||
p.ReasonResign,
|
||||
p.Remark,
|
||||
p.ApproveReason,
|
||||
p.RejectReason,
|
||||
|
|
@ -243,6 +244,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
p.SendDate,
|
||||
p.ActiveDate,
|
||||
p.Reason,
|
||||
p.ReasonResign,
|
||||
p.Remark,
|
||||
p.Status,
|
||||
salary = p.AmountOld,
|
||||
|
|
@ -366,6 +368,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
p.SendDate,
|
||||
p.ActiveDate,
|
||||
p.Reason,
|
||||
p.ReasonResign,
|
||||
p.Remark,
|
||||
p.Status,
|
||||
salary = p.AmountOld,
|
||||
|
|
@ -458,6 +461,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
data.SendDate,
|
||||
data.ActiveDate,
|
||||
data.Reason,
|
||||
data.ReasonResign,
|
||||
data.Remark,
|
||||
data.Status,
|
||||
data.salary,
|
||||
|
|
@ -884,6 +888,19 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
// if (profile == null)
|
||||
// return Error(GlobalMessages.DataNotFound, 404);
|
||||
|
||||
var Remark = req.Remark;
|
||||
if (req.Reason != null)
|
||||
{
|
||||
switch (req.Reason.Trim().ToLower())
|
||||
{
|
||||
case "CAREER": Remark = $"ประกอบอาชีพอื่น ({req.Remark})"; break;
|
||||
case "MOVE": Remark = $"รับราชการสังกัดอื่น ({req.Remark})"; break;
|
||||
case "FAMILY": Remark = $"ดูแลบิดามารดา ({req.Remark})"; break;
|
||||
case "EDUCATION": Remark = $"ศึกษาต่อ ({req.Remark})"; break;
|
||||
case "OTHER": Remark = $"อื่น ๆ ({req.Remark})"; break;
|
||||
}
|
||||
}
|
||||
|
||||
var retirementResign = new RetirementResign
|
||||
{
|
||||
// Profile = profile,
|
||||
|
|
@ -891,6 +908,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
SendDate = DateTime.Now,
|
||||
ActiveDate = req.ActiveDate,
|
||||
Reason = req.Reason,
|
||||
ReasonResign = Remark,
|
||||
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,
|
||||
|
|
@ -1028,8 +1046,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
|
||||
updated.Location = req.Location;
|
||||
updated.ActiveDate = req.ActiveDate;
|
||||
updated.Reason = req.Reason;
|
||||
// updated.Reason = req.Reason;
|
||||
updated.Remark = req.Remark;
|
||||
updated.ReasonResign = req.Reason;
|
||||
updated.OrganizationPositionOld = req.OrganizationPositionOld;
|
||||
updated.RemarkHorizontal = req.RemarkHorizontal;
|
||||
updated.PositionTypeOld = req.PositionTypeOld;
|
||||
|
|
@ -1180,7 +1199,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
Location = updated.Location,
|
||||
SendDate = updated.SendDate,
|
||||
ActiveDate = updated.ActiveDate,
|
||||
Reason = updated.Reason,
|
||||
Reason = updated.ReasonResign,
|
||||
Remark = updated.Remark,
|
||||
OrganizationPositionOld = updated.OrganizationPositionOld,
|
||||
PositionTypeOld = updated.PositionTypeOld,
|
||||
|
|
|
|||
|
|
@ -93,6 +93,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
p.SendDate,
|
||||
p.ActiveDate,
|
||||
p.Reason,
|
||||
p.ReasonResign,
|
||||
p.Remark,
|
||||
p.ApproveReason,
|
||||
p.RejectReason,
|
||||
|
|
@ -187,6 +188,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
p.SendDate,
|
||||
p.ActiveDate,
|
||||
p.Reason,
|
||||
p.ReasonResign,
|
||||
p.Remark,
|
||||
p.Status,
|
||||
salary = p.AmountOld,
|
||||
|
|
@ -309,6 +311,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
p.SendDate,
|
||||
p.ActiveDate,
|
||||
p.Reason,
|
||||
p.ReasonResign,
|
||||
p.Remark,
|
||||
p.Status,
|
||||
salary = p.AmountOld,
|
||||
|
|
@ -401,6 +404,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
data.SendDate,
|
||||
data.ActiveDate,
|
||||
data.Reason,
|
||||
data.ReasonResign,
|
||||
data.Remark,
|
||||
data.Status,
|
||||
data.salary,
|
||||
|
|
@ -827,6 +831,18 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
// if (profile == null)
|
||||
// return Error(GlobalMessages.DataNotFound, 404);
|
||||
|
||||
var Remark = req.Remark;
|
||||
if (req.Reason != null)
|
||||
{
|
||||
switch (req.Reason.Trim().ToLower())
|
||||
{
|
||||
case "CAREER": Remark = $"ประกอบอาชีพอื่น ({req.Remark})"; break;
|
||||
case "MOVE": Remark = $"รับราชการสังกัดอื่น ({req.Remark})"; break;
|
||||
case "FAMILY": Remark = $"ดูแลบิดามารดา ({req.Remark})"; break;
|
||||
case "EDUCATION": Remark = $"ศึกษาต่อ ({req.Remark})"; break;
|
||||
case "OTHER": Remark = $"อื่น ๆ ({req.Remark})"; break;
|
||||
}
|
||||
}
|
||||
var retirementResignEmployee = new RetirementResignEmployee
|
||||
{
|
||||
// Profile = profile,
|
||||
|
|
@ -834,6 +850,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
SendDate = DateTime.Now,
|
||||
ActiveDate = req.ActiveDate,
|
||||
Reason = req.Reason,
|
||||
ReasonResign = Remark,
|
||||
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,
|
||||
|
|
@ -971,8 +988,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
|
||||
updated.Location = req.Location;
|
||||
updated.ActiveDate = req.ActiveDate;
|
||||
updated.Reason = req.Reason;
|
||||
// updated.Reason = req.Reason;
|
||||
updated.Remark = req.Remark;
|
||||
updated.ReasonResign = req.Reason;
|
||||
updated.OrganizationPositionOld = req.OrganizationPositionOld;
|
||||
updated.RemarkHorizontal = req.RemarkHorizontal;
|
||||
updated.PositionTypeOld = req.PositionTypeOld;
|
||||
|
|
@ -1123,7 +1141,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
Location = updated.Location,
|
||||
SendDate = updated.SendDate,
|
||||
ActiveDate = updated.ActiveDate,
|
||||
Reason = updated.Reason,
|
||||
Reason = updated.ReasonResign,
|
||||
Remark = updated.Remark,
|
||||
OrganizationPositionOld = updated.OrganizationPositionOld,
|
||||
PositionTypeOld = updated.PositionTypeOld,
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ namespace BMA.EHR.Retirement.Service.Requests
|
|||
public DateTime? ActiveDate { get; set; }
|
||||
public string? Reason { get; set; }
|
||||
public string? Remark { get; set; }
|
||||
public string? ReasonResign { get; set; }
|
||||
public string? OrganizationPositionOld { get; set; }
|
||||
public string? PositionTypeOld { get; set; }
|
||||
public string? PositionLevelOld { get; set; }
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ namespace BMA.EHR.Retirement.Service.Requests
|
|||
public DateTime? ActiveDate { get; set; }
|
||||
public string? Reason { get; set; }
|
||||
public string? Remark { get; set; }
|
||||
public string? ReasonResign { get; set; }
|
||||
public string? OrganizationPositionOld { get; set; }
|
||||
public string? PositionTypeOld { get; set; }
|
||||
public string? PositionLevelOld { get; set; }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue