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

Merge branch 'dev' into adiDev
All checks were successful
Build & Deploy Placement Service / build (push) Successful in 1m45s
Details

Browse source
This commit is contained in:
Adisak 2026-06-04 16:54:17 +07:00
commit 6f1ca58f04
4 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -1513,7 +1513,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
return Error(GlobalMessages.RetirementResignNotFound, 404); return Error(GlobalMessages.RetirementResignNotFound, 404);
updated.Location = req.Location; updated.Location = req.Location;
updated.ActiveDate = req.ActiveDate; if (req.SendDate != null)
{
updated.SendDate = req.SendDate;
}
// updated.Reason = req.Reason; // updated.Reason = req.Reason;
updated.Remark = req.Remark; updated.Remark = req.Remark;
updated.ReasonResign = req.Reason; updated.ReasonResign = req.Reason;

5
BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
View file

@ -1450,7 +1450,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
return Error(GlobalMessages.RetirementResignEmployeeNotFound, 404); return Error(GlobalMessages.RetirementResignEmployeeNotFound, 404);
updated.Location = req.Location; updated.Location = req.Location;
updated.ActiveDate = req.ActiveDate; if (req.SendDate != null)
{
updated.SendDate = req.SendDate;
}
// updated.Reason = req.Reason; // updated.Reason = req.Reason;
updated.Remark = req.Remark; updated.Remark = req.Remark;
updated.ReasonResign = req.Reason; updated.ReasonResign = req.Reason;

2
BMA.EHR.Retirement.Service/Requests/RetirementResignEmployeeRequest.cs
View file

@ -6,7 +6,7 @@ namespace BMA.EHR.Retirement.Service.Requests
public class RetirementResignEmployeeRequest public class RetirementResignEmployeeRequest
{ {
public string? Location { get; set; } public string? Location { get; set; }
// public DateTime? SendDate { get; set; } public DateTime? SendDate { get; set; }
public DateTime? ActiveDate { get; set; } public DateTime? ActiveDate { get; set; }
public string? Reason { get; set; } public string? Reason { get; set; }
public string? Remark { get; set; } public string? Remark { get; set; }

2
BMA.EHR.Retirement.Service/Requests/RetirementResignRequest.cs
View file

@ -6,7 +6,7 @@ namespace BMA.EHR.Retirement.Service.Requests
public class RetirementResignRequest public class RetirementResignRequest
{ {
public string? Location { get; set; } public string? Location { get; set; }
// public DateTime? SendDate { get; set; } public DateTime? SendDate { get; set; }
public DateTime? ActiveDate { get; set; } public DateTime? ActiveDate { get; set; }
public string? Reason { get; set; } public string? Reason { get; set; }
public string? Remark { get; set; } public string? Remark { get; set; }