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

fix บันทึกการพิจารณาของระบบขอลาออกกรณีเส้นอนุมัติ วันที่สิ้นสุดการยับยั้งต้องว่าง #1518
Some checks failed
release-dev / release-dev (push) Failing after 11s
Details

Browse source
This commit is contained in:
Bright 2025-05-13 14:29:49 +07:00
parent 9e953cd5d6
commit 3f31f68c60
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
BMA.EHR.Application/Repositories/RetirementRepository.cs
View file

@ -137,7 +137,7 @@ namespace BMA.EHR.Application.Repositories
await _dbContext.SaveChangesAsync(); await _dbContext.SaveChangesAsync();
} }
public async Task CommanderApproveRetirementResign(Guid id, string reason, DateTime date) public async Task CommanderApproveRetirementResign(Guid id, string reason, DateTime? date)
{ {
// Get UserId from token // Get UserId from token
var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId); var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
@ -220,7 +220,7 @@ namespace BMA.EHR.Application.Repositories
} }
} }
public async Task CommanderRejectRetirementResign(Guid id, string reason, DateTime date) public async Task CommanderRejectRetirementResign(Guid id, string reason, DateTime? date)
{ {
// Get UserId from token // Get UserId from token
var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId); var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
@ -307,7 +307,7 @@ namespace BMA.EHR.Application.Repositories
} }
public async Task ApproveRetirementResign(Guid id, string reason, DateTime date) public async Task ApproveRetirementResign(Guid id, string reason, DateTime? date)
{ {
// Get UserId from token // Get UserId from token
var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId); var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
@ -387,7 +387,7 @@ namespace BMA.EHR.Application.Repositories
} }
public async Task RejectRetirementResign(Guid id, string reason, DateTime date) public async Task RejectRetirementResign(Guid id, string reason, DateTime? date)
{ {
// Get UserId from token // Get UserId from token
var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId); var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);

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

@ -2663,7 +2663,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
// { // {
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); // return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
// } // }
await _repository.CommanderApproveRetirementResign(id, req.Reason ?? "", req.Date ?? DateTime.Now); await _repository.CommanderApproveRetirementResign(id, req.Reason ?? "", null);
return Success(); return Success();
} }
@ -2697,7 +2697,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
// { // {
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); // return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
// } // }
await _repository.CommanderRejectRetirementResign(id, req.Reason ?? "", req.Date ?? DateTime.Now); await _repository.CommanderRejectRetirementResign(id, req.Reason ?? "", req.Date);
return Success(); return Success();
} }
@ -2731,7 +2731,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
// { // {
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); // return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
// } // }
await _repository.ApproveRetirementResign(id, req.Reason ?? "", req.Date ?? DateTime.Now); await _repository.ApproveRetirementResign(id, req.Reason ?? "", null);
return Success(); return Success();
} }
@ -2765,7 +2765,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
// { // {
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); // return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
// } // }
await _repository.RejectRetirementResign(id, req.Reason ?? "", req.Date ?? DateTime.Now); await _repository.RejectRetirementResign(id, req.Reason ?? "", req.Date);
return Success(); return Success();
} }