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

fix resign detail

Browse source
This commit is contained in:
Warunee Tamkoo 2025-06-10 16:42:37 +07:00
parent b0cfc2eee9
commit 4bf0593b0e
2 changed files with 353 additions and 353 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -347,8 +347,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();
if (dataMain == null) if (dataMain == null)
return Error(GlobalMessages.RetirementResignNotFound, 404); return Error(GlobalMessages.RetirementResignNotFound, 404);
if (dataMain.IsCancel != true) // if (dataMain.IsCancel != true)
{ // {
var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "SYS_RESIGN"); var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "SYS_RESIGN");
var createdUserId = await _context.RetirementResigns.AsQueryable() var createdUserId = await _context.RetirementResigns.AsQueryable()
.Where(x => x.Id == id) .Where(x => x.Id == id)
@ -522,182 +522,182 @@ namespace BMA.EHR.Retirement.Service.Controllers
}; };
return Success(_data); return Success(_data);
} // }
else // else
{ // {
var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "RETIREMENT_CANCEL"); // var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "RETIREMENT_CANCEL");
var createdUserId = await _context.RetirementResignCancels.AsQueryable() // var createdUserId = await _context.RetirementResignCancels.AsQueryable()
.Where(x => x.CreatedUserId == UserId) // .Where(x => x.CreatedUserId == UserId)
.Where(x => x.RetirementResign.Id == id) // .Where(x => x.RetirementResign.Id == id)
.FirstOrDefaultAsync(); // .FirstOrDefaultAsync();
if (getWorkflow == false && createdUserId == null) // if (getWorkflow == false && createdUserId == null)
{ // {
var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_RESIGN"); // var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_RESIGN");
var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission); // var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
if (jsonData["status"]?.ToString() != "200") // if (jsonData["status"]?.ToString() != "200")
{ // {
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); // return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
} // }
} // }
var data = await _context.RetirementResignCancels.AsQueryable() // var data = await _context.RetirementResignCancels.AsQueryable()
.Where(x => x.RetirementResign.Id == id) // .Where(x => x.RetirementResign.Id == id)
.Select(p => new // .Select(p => new
{ // {
p.Id, // p.Id,
p.prefix, // p.prefix,
p.firstName, // p.firstName,
p.lastName, // p.lastName,
p.profileId, // p.profileId,
p.Location, // p.Location,
p.SendDate, // p.SendDate,
p.ActiveDate, // p.ActiveDate,
p.Reason, // p.Reason,
p.Remark, // p.Remark,
p.Status, // p.Status,
salary = p.AmountOld, // salary = p.AmountOld,
p.ApproveReason, // p.ApproveReason,
p.RejectReason, // p.RejectReason,
p.IsActive, // p.IsActive,
p.CreatedAt, // p.CreatedAt,
p.PositionTypeOld, // p.PositionTypeOld,
p.PositionLevelOld, // p.PositionLevelOld,
p.PositionNumberOld, // p.PositionNumberOld,
p.OrganizationPositionOld, // p.OrganizationPositionOld,
p.OligarchReject, // p.OligarchReject,
p.OligarchApproveReason, // p.OligarchApproveReason,
p.OligarchRejectReason, // p.OligarchRejectReason,
p.OligarchRejectDate, // p.OligarchRejectDate,
p.CommanderReject, // p.CommanderReject,
p.CommanderApproveReason, // p.CommanderApproveReason,
p.CommanderRejectReason, // p.CommanderRejectReason,
p.CommanderRejectDate, // p.CommanderRejectDate,
p.OfficerReject, // p.OfficerReject,
p.OfficerApproveReason, // p.OfficerApproveReason,
p.OfficerRejectReason, // p.OfficerRejectReason,
p.OfficerRejectDate, // p.OfficerRejectDate,
p.RemarkHorizontal, // p.RemarkHorizontal,
p.rootOld, // p.rootOld,
p.rootOldId, // p.rootOldId,
p.rootShortNameOld, // p.rootShortNameOld,
p.child1Old, // p.child1Old,
p.child1OldId, // p.child1OldId,
p.child1ShortNameOld, // p.child1ShortNameOld,
p.child2Old, // p.child2Old,
p.child2OldId, // p.child2OldId,
p.child2ShortNameOld, // p.child2ShortNameOld,
p.child3Old, // p.child3Old,
p.child3OldId, // p.child3OldId,
p.child3ShortNameOld, // p.child3ShortNameOld,
p.child4Old, // p.child4Old,
p.child4OldId, // p.child4OldId,
p.child4ShortNameOld, // p.child4ShortNameOld,
p.PositionOld, // p.PositionOld,
p.posMasterNoOld, // p.posMasterNoOld,
p.posTypeOldId, // p.posTypeOldId,
p.posTypeNameOld, // p.posTypeNameOld,
p.posLevelOldId, // p.posLevelOldId,
p.posLevelNameOld, // p.posLevelNameOld,
p.IsNoDebt, // p.IsNoDebt,
p.IsNoBurden, // p.IsNoBurden,
p.IsDiscipline, // p.IsDiscipline,
p.CancelReason, // p.CancelReason,
p.ApproveStep, // p.ApproveStep,
p.Group, // p.Group,
Approvers = p.Approvers.Where(x => x.ApproveType.ToUpper() == "APPROVER"), // Approvers = p.Approvers.Where(x => x.ApproveType.ToUpper() == "APPROVER"),
Commanders = p.Approvers.Where(x => x.ApproveType.ToUpper() == "COMMANDER"), // Commanders = p.Approvers.Where(x => x.ApproveType.ToUpper() == "COMMANDER"),
KeycloakUserId = p.CreatedUserId, // KeycloakUserId = p.CreatedUserId,
idMain = p.RetirementResign.Id, // idMain = p.RetirementResign.Id,
statusMain = p.RetirementResign.Status, // statusMain = p.RetirementResign.Status,
RetirementResignDocs = p.RetirementResign.RetirementResignDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }), // RetirementResignDocs = p.RetirementResign.RetirementResignDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
}) // })
.FirstOrDefaultAsync(); // .FirstOrDefaultAsync();
if (data == null) // if (data == null)
return Error(GlobalMessages.RetirementResignNotFound, 404); // return Error(GlobalMessages.RetirementResignNotFound, 404);
var retirementResignDocs = new List<dynamic>(); // var retirementResignDocs = new List<dynamic>();
foreach (var doc in data.RetirementResignDocs) // foreach (var doc in data.RetirementResignDocs)
{ // {
var _doc = new // var _doc = new
{ // {
FileName = doc.FileName, // FileName = doc.FileName,
PathName = await _documentService.ImagesPath(doc.Id), // PathName = await _documentService.ImagesPath(doc.Id),
doc.Id, // doc.Id,
}; // };
retirementResignDocs.Add(_doc); // retirementResignDocs.Add(_doc);
} // }
var _data = new // var _data = new
{ // {
data.Id, // data.Id,
data.profileId, // data.profileId,
data.prefix, // data.prefix,
// data.PrefixId, // // data.PrefixId,
data.firstName, // data.firstName,
data.lastName, // data.lastName,
data.Location, // data.Location,
data.SendDate, // data.SendDate,
data.ActiveDate, // data.ActiveDate,
data.Reason, // data.Reason,
data.Remark, // data.Remark,
data.Status, // data.Status,
data.salary, // data.salary,
data.PositionTypeOld, // data.PositionTypeOld,
data.PositionLevelOld, // data.PositionLevelOld,
data.PositionNumberOld, // data.PositionNumberOld,
data.OrganizationPositionOld, // data.OrganizationPositionOld,
data.ApproveReason, // data.ApproveReason,
data.RejectReason, // data.RejectReason,
data.IsActive, // data.IsActive,
data.CreatedAt, // data.CreatedAt,
data.OligarchReject, // data.OligarchReject,
data.OligarchApproveReason, // data.OligarchApproveReason,
data.OligarchRejectReason, // data.OligarchRejectReason,
data.OligarchRejectDate, // data.OligarchRejectDate,
data.CommanderReject, // data.CommanderReject,
data.CommanderApproveReason, // data.CommanderApproveReason,
data.CommanderRejectReason, // data.CommanderRejectReason,
data.CommanderRejectDate, // data.CommanderRejectDate,
data.OfficerReject, // data.OfficerReject,
data.OfficerApproveReason, // data.OfficerApproveReason,
data.OfficerRejectReason, // data.OfficerRejectReason,
data.OfficerRejectDate, // data.OfficerRejectDate,
data.RemarkHorizontal, // data.RemarkHorizontal,
data.rootOld, // data.rootOld,
data.rootOldId, // data.rootOldId,
data.rootShortNameOld, // data.rootShortNameOld,
data.child1Old, // data.child1Old,
data.child1OldId, // data.child1OldId,
data.child1ShortNameOld, // data.child1ShortNameOld,
data.child2Old, // data.child2Old,
data.child2OldId, // data.child2OldId,
data.child2ShortNameOld, // data.child2ShortNameOld,
data.child3Old, // data.child3Old,
data.child3OldId, // data.child3OldId,
data.child3ShortNameOld, // data.child3ShortNameOld,
data.child4Old, // data.child4Old,
data.child4OldId, // data.child4OldId,
data.child4ShortNameOld, // data.child4ShortNameOld,
data.PositionOld, // data.PositionOld,
data.posMasterNoOld, // data.posMasterNoOld,
data.posTypeOldId, // data.posTypeOldId,
data.posTypeNameOld, // data.posTypeNameOld,
data.posLevelOldId, // data.posLevelOldId,
data.posLevelNameOld, // data.posLevelNameOld,
data.IsNoDebt, // data.IsNoDebt,
data.IsNoBurden, // data.IsNoBurden,
data.IsDiscipline, // data.IsDiscipline,
data.CancelReason, // data.CancelReason,
data.idMain, // data.idMain,
data.statusMain, // data.statusMain,
data.KeycloakUserId, // data.KeycloakUserId,
data.ApproveStep, // data.ApproveStep,
data.Group, // data.Group,
data.Approvers, // data.Approvers,
data.Commanders, // data.Commanders,
statusCancel = data.Status, // statusCancel = data.Status,
Docs = retirementResignDocs, // Docs = retirementResignDocs,
}; // };
return Success(_data); // return Success(_data);
} // }
} }
/// <summary> /// <summary>

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

@ -286,8 +286,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
if (dataMain == null) if (dataMain == null)
return Error(GlobalMessages.RetirementResignEmployeeNotFound, 404); return Error(GlobalMessages.RetirementResignEmployeeNotFound, 404);
if (dataMain.IsCancel != true) // if (dataMain.IsCancel != true)
{ // {
var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "SYS_RESIGN_EMP"); var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "SYS_RESIGN_EMP");
var createdUserId = await _context.RetirementResignEmployees.AsQueryable() var createdUserId = await _context.RetirementResignEmployees.AsQueryable()
.Where(x => x.Id == id) .Where(x => x.Id == id)
@ -461,181 +461,181 @@ namespace BMA.EHR.Retirement.Service.Controllers
}; };
return Success(_data); return Success(_data);
} // }
else // else
{ // {
var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "RETIREMENT_CANCEL_EMP"); // var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "RETIREMENT_CANCEL_EMP");
var createdUserId = await _context.RetirementResignEmployeeCancels.AsQueryable() // var createdUserId = await _context.RetirementResignEmployeeCancels.AsQueryable()
.Where(x => x.CreatedUserId == UserId) // .Where(x => x.CreatedUserId == UserId)
.Where(x => x.RetirementResignEmployee.Id == id) // .Where(x => x.RetirementResignEmployee.Id == id)
.FirstOrDefaultAsync(); // .FirstOrDefaultAsync();
if (getWorkflow == false && createdUserId == null) // if (getWorkflow == false && createdUserId == null)
{ // {
var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_RESIGN_EMP"); // var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_RESIGN_EMP");
var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission); // var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
if (jsonData["status"]?.ToString() != "200") // if (jsonData["status"]?.ToString() != "200")
{ // {
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); // return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
} // }
} // }
var data = await _context.RetirementResignEmployeeCancels.AsQueryable() // var data = await _context.RetirementResignEmployeeCancels.AsQueryable()
.Where(x => x.RetirementResignEmployee.Id == id) // .Where(x => x.RetirementResignEmployee.Id == id)
.Select(p => new // .Select(p => new
{ // {
p.Id, // p.Id,
p.prefix, // p.prefix,
p.firstName, // p.firstName,
p.lastName, // p.lastName,
p.profileId, // p.profileId,
p.Location, // p.Location,
p.SendDate, // p.SendDate,
p.ActiveDate, // p.ActiveDate,
p.Reason, // p.Reason,
p.Remark, // p.Remark,
p.Status, // p.Status,
salary = p.AmountOld, // salary = p.AmountOld,
p.ApproveReason, // p.ApproveReason,
p.RejectReason, // p.RejectReason,
p.IsActive, // p.IsActive,
p.CreatedAt, // p.CreatedAt,
p.PositionTypeOld, // p.PositionTypeOld,
p.PositionLevelOld, // p.PositionLevelOld,
p.PositionNumberOld, // p.PositionNumberOld,
p.OrganizationPositionOld, // p.OrganizationPositionOld,
p.OligarchReject, // p.OligarchReject,
p.OligarchApproveReason, // p.OligarchApproveReason,
p.OligarchRejectReason, // p.OligarchRejectReason,
p.OligarchRejectDate, // p.OligarchRejectDate,
p.CommanderReject, // p.CommanderReject,
p.CommanderApproveReason, // p.CommanderApproveReason,
p.CommanderRejectReason, // p.CommanderRejectReason,
p.CommanderRejectDate, // p.CommanderRejectDate,
p.OfficerReject, // p.OfficerReject,
p.OfficerApproveReason, // p.OfficerApproveReason,
p.OfficerRejectReason, // p.OfficerRejectReason,
p.OfficerRejectDate, // p.OfficerRejectDate,
p.RemarkHorizontal, // p.RemarkHorizontal,
p.rootOld, // p.rootOld,
p.rootOldId, // p.rootOldId,
p.rootShortNameOld, // p.rootShortNameOld,
p.child1Old, // p.child1Old,
p.child1OldId, // p.child1OldId,
p.child1ShortNameOld, // p.child1ShortNameOld,
p.child2Old, // p.child2Old,
p.child2OldId, // p.child2OldId,
p.child2ShortNameOld, // p.child2ShortNameOld,
p.child3Old, // p.child3Old,
p.child3OldId, // p.child3OldId,
p.child3ShortNameOld, // p.child3ShortNameOld,
p.child4Old, // p.child4Old,
p.child4OldId, // p.child4OldId,
p.child4ShortNameOld, // p.child4ShortNameOld,
p.PositionOld, // p.PositionOld,
p.posMasterNoOld, // p.posMasterNoOld,
p.posTypeOldId, // p.posTypeOldId,
p.posTypeNameOld, // p.posTypeNameOld,
p.posLevelOldId, // p.posLevelOldId,
p.posLevelNameOld, // p.posLevelNameOld,
p.IsNoDebt, // p.IsNoDebt,
p.IsNoBurden, // p.IsNoBurden,
p.IsDiscipline, // p.IsDiscipline,
p.ApproveStep, // p.ApproveStep,
p.Group, // p.Group,
Approvers = p.Approvers.Where(x => x.ApproveType.ToUpper() == "APPROVER"), // Approvers = p.Approvers.Where(x => x.ApproveType.ToUpper() == "APPROVER"),
Commanders = p.Approvers.Where(x => x.ApproveType.ToUpper() == "COMMANDER"), // Commanders = p.Approvers.Where(x => x.ApproveType.ToUpper() == "COMMANDER"),
KeycloakUserId = p.CreatedUserId, // KeycloakUserId = p.CreatedUserId,
p.CancelReason, // p.CancelReason,
idMain = p.RetirementResignEmployee.Id, // idMain = p.RetirementResignEmployee.Id,
statusMain = p.RetirementResignEmployee.Status, // statusMain = p.RetirementResignEmployee.Status,
RetirementResignEmployeeDocs = p.RetirementResignEmployee.RetirementResignEmployeeDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }), // RetirementResignEmployeeDocs = p.RetirementResignEmployee.RetirementResignEmployeeDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
}) // })
.FirstOrDefaultAsync(); // .FirstOrDefaultAsync();
if (data == null) // if (data == null)
return Error(GlobalMessages.RetirementResignEmployeeNotFound, 404); // return Error(GlobalMessages.RetirementResignEmployeeNotFound, 404);
var retirementResignEmployeeDocs = new List<dynamic>(); // var retirementResignEmployeeDocs = new List<dynamic>();
foreach (var doc in data.RetirementResignEmployeeDocs) // foreach (var doc in data.RetirementResignEmployeeDocs)
{ // {
var _doc = new // var _doc = new
{ // {
FileName = doc.FileName, // FileName = doc.FileName,
PathName = await _documentService.ImagesPath(doc.Id), // PathName = await _documentService.ImagesPath(doc.Id),
doc.Id, // doc.Id,
}; // };
retirementResignEmployeeDocs.Add(_doc); // retirementResignEmployeeDocs.Add(_doc);
} // }
var _data = new // var _data = new
{ // {
data.Id, // data.Id,
data.profileId, // data.profileId,
data.prefix, // data.prefix,
data.firstName, // data.firstName,
data.lastName, // data.lastName,
data.Location, // data.Location,
data.SendDate, // data.SendDate,
data.ActiveDate, // data.ActiveDate,
data.Reason, // data.Reason,
data.Remark, // data.Remark,
data.Status, // data.Status,
data.salary, // data.salary,
data.PositionTypeOld, // data.PositionTypeOld,
data.PositionLevelOld, // data.PositionLevelOld,
data.PositionNumberOld, // data.PositionNumberOld,
data.OrganizationPositionOld, // data.OrganizationPositionOld,
data.ApproveReason, // data.ApproveReason,
data.RejectReason, // data.RejectReason,
data.IsActive, // data.IsActive,
data.CreatedAt, // data.CreatedAt,
data.OligarchReject, // data.OligarchReject,
data.OligarchApproveReason, // data.OligarchApproveReason,
data.OligarchRejectReason, // data.OligarchRejectReason,
data.OligarchRejectDate, // data.OligarchRejectDate,
data.CommanderReject, // data.CommanderReject,
data.CommanderApproveReason, // data.CommanderApproveReason,
data.CommanderRejectReason, // data.CommanderRejectReason,
data.CommanderRejectDate, // data.CommanderRejectDate,
data.OfficerReject, // data.OfficerReject,
data.OfficerApproveReason, // data.OfficerApproveReason,
data.OfficerRejectReason, // data.OfficerRejectReason,
data.OfficerRejectDate, // data.OfficerRejectDate,
data.RemarkHorizontal, // data.RemarkHorizontal,
data.rootOld, // data.rootOld,
data.rootOldId, // data.rootOldId,
data.rootShortNameOld, // data.rootShortNameOld,
data.child1Old, // data.child1Old,
data.child1OldId, // data.child1OldId,
data.child1ShortNameOld, // data.child1ShortNameOld,
data.child2Old, // data.child2Old,
data.child2OldId, // data.child2OldId,
data.child2ShortNameOld, // data.child2ShortNameOld,
data.child3Old, // data.child3Old,
data.child3OldId, // data.child3OldId,
data.child3ShortNameOld, // data.child3ShortNameOld,
data.child4Old, // data.child4Old,
data.child4OldId, // data.child4OldId,
data.child4ShortNameOld, // data.child4ShortNameOld,
data.PositionOld, // data.PositionOld,
data.posMasterNoOld, // data.posMasterNoOld,
data.posTypeOldId, // data.posTypeOldId,
data.posTypeNameOld, // data.posTypeNameOld,
data.posLevelOldId, // data.posLevelOldId,
data.posLevelNameOld, // data.posLevelNameOld,
data.IsNoDebt, // data.IsNoDebt,
data.IsNoBurden, // data.IsNoBurden,
data.IsDiscipline, // data.IsDiscipline,
data.CancelReason, // data.CancelReason,
data.idMain, // data.idMain,
data.statusMain, // data.statusMain,
data.ApproveStep, // data.ApproveStep,
data.Group, // data.Group,
data.KeycloakUserId, // data.KeycloakUserId,
data.Approvers, // data.Approvers,
data.Commanders, // data.Commanders,
statusCancel = data.Status, // statusCancel = data.Status,
Docs = retirementResignEmployeeDocs, // Docs = retirementResignEmployeeDocs,
}; // };
return Success(_data); // return Success(_data);
} // }
} }
/// <summary> /// <summary>