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

เพิ่มวันที่ยับยั่ง

Browse source
This commit is contained in:
moss 2025-05-07 17:13:57 +07:00
parent f2a0b754b3
commit 64eb77674a
13 changed files with 41337 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2598,6 +2598,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
PositionName = r.PositionName,
ProfileId = r.ProfileId,
KeycloakId = r.KeycloakId,
Org = r.Org,
ApproveStatus = "PENDING",
ApproveType = type.Trim().ToUpper()
});
@ -2662,7 +2663,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
// {
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
// }
await _repository.CommanderApproveRetirementResign(id, req.Reason ?? "");
await _repository.CommanderApproveRetirementResign(id, req.Reason ?? "", req.Date ?? DateTime.Now);
return Success();
}
@ -2696,7 +2697,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
// {
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
// }
await _repository.CommanderRejectRetirementResign(id, req.Reason ?? "");
await _repository.CommanderRejectRetirementResign(id, req.Reason ?? "", req.Date ?? DateTime.Now);
return Success();
}
@ -2730,7 +2731,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
// {
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
// }
await _repository.ApproveRetirementResign(id, req.Reason ?? "");
await _repository.ApproveRetirementResign(id, req.Reason ?? "", req.Date ?? DateTime.Now);
return Success();
}
@ -2764,7 +2765,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
// {
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
// }
await _repository.RejectRetirementResign(id, req.Reason ?? "");
await _repository.RejectRetirementResign(id, req.Reason ?? "", req.Date ?? DateTime.Now);
return Success();
}

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

@ -1994,6 +1994,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
PositionName = r.PositionName,
ProfileId = r.ProfileId,
KeycloakId = r.KeycloakId,
Org = r.Org,
ApproveStatus = "PENDING",
ApproveType = type.Trim().ToUpper()
});
@ -2058,7 +2059,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
// {
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
// }
await _repository.CommanderApproveRetirementResignEmployee(id, req.Reason ?? "");
await _repository.CommanderApproveRetirementResignEmployee(id, req.Reason ?? "", req.Date ?? DateTime.Now);
return Success();
}
@ -2092,7 +2093,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
// {
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
// }
await _repository.CommanderRejectRetirementResignEmployee(id, req.Reason ?? "");
await _repository.CommanderRejectRetirementResignEmployee(id, req.Reason ?? "", req.Date ?? DateTime.Now);
return Success();
}
@ -2126,7 +2127,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
// {
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
// }
await _repository.ApproveRetirementResignEmployee(id, req.Reason ?? "");
await _repository.ApproveRetirementResignEmployee(id, req.Reason ?? "", req.Date ?? DateTime.Now);
return Success();
}
@ -2160,7 +2161,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
// {
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
// }
await _repository.RejectRetirementResignEmployee(id, req.Reason ?? "");
await _repository.RejectRetirementResignEmployee(id, req.Reason ?? "", req.Date ?? DateTime.Now);
return Success();
}