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:
kittapath 2024-11-14 11:00:22 +07:00
parent 2efc1910f6
commit a951378b1f
21 changed files with 57711 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -327,13 +327,13 @@ namespace BMA.EHR.Retirement.Service.Controllers
.Where(x => x.Id == id)
.Select(p => new
{
p.Status,
p.IsCancel,
})
.FirstOrDefaultAsync();
if (dataMain == null)
return Error(GlobalMessages.RetirementResignNotFound, 404);
if (dataMain.Status != "CANCEL")
if (dataMain.IsCancel != true)
{
var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "SYS_RESIGN");
var createdUserId = await _context.RetirementResigns.AsQueryable()
@ -503,6 +503,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.CancelReason,
idCancel = data.RetirementResignCancels?.Id ?? Guid.Empty,
statusCancel = data.RetirementResignCancels?.Status ?? null,
statusMain = data.Status,
// Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar),
Docs = retirementResignDocs,
// DocDebts = retirementResignDebtDocs,
@ -512,7 +513,6 @@ namespace BMA.EHR.Retirement.Service.Controllers
}
else
{
var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "RETIREMENT_CANCEL");
var createdUserId = await _context.RetirementResignCancels.AsQueryable()
.Where(x => x.CreatedUserId == UserId)
@ -669,6 +669,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.CancelReason,
data.idMain,
data.statusMain,
statusCancel = data.Status,
// Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar),
Docs = retirementResignDocs,
// DocDebts = retirementResignDebtDocs,
@ -1242,6 +1243,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
posTypeName = retirementResignCancel.PositionTypeOld,
});
}
updated.IsCancel = true;
}
// else
// {

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

@ -271,13 +271,13 @@ namespace BMA.EHR.Retirement.Service.Controllers
.Where(x => x.Id == id)
.Select(p => new
{
p.Status,
p.IsCancel,
})
.FirstOrDefaultAsync();
if (dataMain == null)
return Error(GlobalMessages.RetirementResignEmployeeNotFound, 404);
if (dataMain.Status != "CANCEL")
if (dataMain.IsCancel != true)
{
var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "SYS_RESIGN");
var createdUserId = await _context.RetirementResignEmployees.AsQueryable()
@ -447,6 +447,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.CancelReason,
idCancel = data.RetirementResignEmployeeCancels?.Id ?? Guid.Empty,
statusCancel = data.RetirementResignEmployeeCancels?.Status ?? null,
statusMain = data.Status,
// Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar),
Docs = retirementResignEmployeeDocs,
// DocDebts = retirementResignEmployeeDebtDocs,
@ -456,7 +457,6 @@ namespace BMA.EHR.Retirement.Service.Controllers
}
else
{
var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "RETIREMENT_CANCEL");
var createdUserId = await _context.RetirementResignEmployeeCancels.AsQueryable()
.Where(x => x.CreatedUserId == UserId)
@ -613,6 +613,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.CancelReason,
data.idMain,
data.statusMain,
statusCancel = data.Status,
// Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar),
Docs = retirementResignEmployeeDocs,
// DocDebts = retirementResignEmployeeDebtDocs,
@ -1186,6 +1187,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
posTypeName = retirementResignEmployeeCancel.PositionTypeOld,
});
}
updated.IsCancel = true;
}
// else
// {