From 4bf0593b0e0cb299e0b85151a8ebaa068a932634 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 10 Jun 2025 16:42:37 +0700 Subject: [PATCH] fix resign detail --- .../Controllers/RetirementResignController.cs | 354 +++++++++--------- .../RetirementResignEmployeeController.cs | 352 ++++++++--------- 2 files changed, 353 insertions(+), 353 deletions(-) diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index 7621c9a2..5fd88ee9 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -347,8 +347,8 @@ namespace BMA.EHR.Retirement.Service.Controllers .FirstOrDefaultAsync(); if (dataMain == null) return Error(GlobalMessages.RetirementResignNotFound, 404); - if (dataMain.IsCancel != true) - { + // if (dataMain.IsCancel != true) + // { var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "SYS_RESIGN"); var createdUserId = await _context.RetirementResigns.AsQueryable() .Where(x => x.Id == id) @@ -522,182 +522,182 @@ namespace BMA.EHR.Retirement.Service.Controllers }; return Success(_data); - } - else - { - var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "RETIREMENT_CANCEL"); - var createdUserId = await _context.RetirementResignCancels.AsQueryable() - .Where(x => x.CreatedUserId == UserId) - .Where(x => x.RetirementResign.Id == id) - .FirstOrDefaultAsync(); - if (getWorkflow == false && createdUserId == null) - { - var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_RESIGN"); - var jsonData = JsonConvert.DeserializeObject(getPermission); - if (jsonData["status"]?.ToString() != "200") - { - return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); - } - } - var data = await _context.RetirementResignCancels.AsQueryable() - .Where(x => x.RetirementResign.Id == id) - .Select(p => new - { - p.Id, - p.prefix, - p.firstName, - p.lastName, - p.profileId, - p.Location, - p.SendDate, - p.ActiveDate, - p.Reason, - p.Remark, - p.Status, - salary = p.AmountOld, - p.ApproveReason, - p.RejectReason, - p.IsActive, - p.CreatedAt, - p.PositionTypeOld, - p.PositionLevelOld, - p.PositionNumberOld, - p.OrganizationPositionOld, - p.OligarchReject, - p.OligarchApproveReason, - p.OligarchRejectReason, - p.OligarchRejectDate, - p.CommanderReject, - p.CommanderApproveReason, - p.CommanderRejectReason, - p.CommanderRejectDate, - p.OfficerReject, - p.OfficerApproveReason, - p.OfficerRejectReason, - p.OfficerRejectDate, - p.RemarkHorizontal, - p.rootOld, - p.rootOldId, - p.rootShortNameOld, - p.child1Old, - p.child1OldId, - p.child1ShortNameOld, - p.child2Old, - p.child2OldId, - p.child2ShortNameOld, - p.child3Old, - p.child3OldId, - p.child3ShortNameOld, - p.child4Old, - p.child4OldId, - p.child4ShortNameOld, - p.PositionOld, - p.posMasterNoOld, - p.posTypeOldId, - p.posTypeNameOld, - p.posLevelOldId, - p.posLevelNameOld, - p.IsNoDebt, - p.IsNoBurden, - p.IsDiscipline, - p.CancelReason, - p.ApproveStep, - p.Group, - Approvers = p.Approvers.Where(x => x.ApproveType.ToUpper() == "APPROVER"), - Commanders = p.Approvers.Where(x => x.ApproveType.ToUpper() == "COMMANDER"), - KeycloakUserId = p.CreatedUserId, - idMain = p.RetirementResign.Id, - statusMain = p.RetirementResign.Status, - RetirementResignDocs = p.RetirementResign.RetirementResignDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }), - }) - .FirstOrDefaultAsync(); - if (data == null) - return Error(GlobalMessages.RetirementResignNotFound, 404); + // } + // else + // { + // var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "RETIREMENT_CANCEL"); + // var createdUserId = await _context.RetirementResignCancels.AsQueryable() + // .Where(x => x.CreatedUserId == UserId) + // .Where(x => x.RetirementResign.Id == id) + // .FirstOrDefaultAsync(); + // if (getWorkflow == false && createdUserId == null) + // { + // var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_RESIGN"); + // var jsonData = JsonConvert.DeserializeObject(getPermission); + // if (jsonData["status"]?.ToString() != "200") + // { + // return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); + // } + // } + // var data = await _context.RetirementResignCancels.AsQueryable() + // .Where(x => x.RetirementResign.Id == id) + // .Select(p => new + // { + // p.Id, + // p.prefix, + // p.firstName, + // p.lastName, + // p.profileId, + // p.Location, + // p.SendDate, + // p.ActiveDate, + // p.Reason, + // p.Remark, + // p.Status, + // salary = p.AmountOld, + // p.ApproveReason, + // p.RejectReason, + // p.IsActive, + // p.CreatedAt, + // p.PositionTypeOld, + // p.PositionLevelOld, + // p.PositionNumberOld, + // p.OrganizationPositionOld, + // p.OligarchReject, + // p.OligarchApproveReason, + // p.OligarchRejectReason, + // p.OligarchRejectDate, + // p.CommanderReject, + // p.CommanderApproveReason, + // p.CommanderRejectReason, + // p.CommanderRejectDate, + // p.OfficerReject, + // p.OfficerApproveReason, + // p.OfficerRejectReason, + // p.OfficerRejectDate, + // p.RemarkHorizontal, + // p.rootOld, + // p.rootOldId, + // p.rootShortNameOld, + // p.child1Old, + // p.child1OldId, + // p.child1ShortNameOld, + // p.child2Old, + // p.child2OldId, + // p.child2ShortNameOld, + // p.child3Old, + // p.child3OldId, + // p.child3ShortNameOld, + // p.child4Old, + // p.child4OldId, + // p.child4ShortNameOld, + // p.PositionOld, + // p.posMasterNoOld, + // p.posTypeOldId, + // p.posTypeNameOld, + // p.posLevelOldId, + // p.posLevelNameOld, + // p.IsNoDebt, + // p.IsNoBurden, + // p.IsDiscipline, + // p.CancelReason, + // p.ApproveStep, + // p.Group, + // Approvers = p.Approvers.Where(x => x.ApproveType.ToUpper() == "APPROVER"), + // Commanders = p.Approvers.Where(x => x.ApproveType.ToUpper() == "COMMANDER"), + // KeycloakUserId = p.CreatedUserId, + // idMain = p.RetirementResign.Id, + // statusMain = p.RetirementResign.Status, + // RetirementResignDocs = p.RetirementResign.RetirementResignDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }), + // }) + // .FirstOrDefaultAsync(); + // if (data == null) + // return Error(GlobalMessages.RetirementResignNotFound, 404); - var retirementResignDocs = new List(); - foreach (var doc in data.RetirementResignDocs) - { - var _doc = new - { - FileName = doc.FileName, - PathName = await _documentService.ImagesPath(doc.Id), - doc.Id, - }; - retirementResignDocs.Add(_doc); - } - var _data = new - { - data.Id, - data.profileId, - data.prefix, - // data.PrefixId, - data.firstName, - data.lastName, - data.Location, - data.SendDate, - data.ActiveDate, - data.Reason, - data.Remark, - data.Status, - data.salary, - data.PositionTypeOld, - data.PositionLevelOld, - data.PositionNumberOld, - data.OrganizationPositionOld, - data.ApproveReason, - data.RejectReason, - data.IsActive, - data.CreatedAt, - data.OligarchReject, - data.OligarchApproveReason, - data.OligarchRejectReason, - data.OligarchRejectDate, - data.CommanderReject, - data.CommanderApproveReason, - data.CommanderRejectReason, - data.CommanderRejectDate, - data.OfficerReject, - data.OfficerApproveReason, - data.OfficerRejectReason, - data.OfficerRejectDate, - data.RemarkHorizontal, - data.rootOld, - data.rootOldId, - data.rootShortNameOld, - data.child1Old, - data.child1OldId, - data.child1ShortNameOld, - data.child2Old, - data.child2OldId, - data.child2ShortNameOld, - data.child3Old, - data.child3OldId, - data.child3ShortNameOld, - data.child4Old, - data.child4OldId, - data.child4ShortNameOld, - data.PositionOld, - data.posMasterNoOld, - data.posTypeOldId, - data.posTypeNameOld, - data.posLevelOldId, - data.posLevelNameOld, - data.IsNoDebt, - data.IsNoBurden, - data.IsDiscipline, - data.CancelReason, - data.idMain, - data.statusMain, - data.KeycloakUserId, - data.ApproveStep, - data.Group, - data.Approvers, - data.Commanders, - statusCancel = data.Status, - Docs = retirementResignDocs, - }; - return Success(_data); - } + // var retirementResignDocs = new List(); + // foreach (var doc in data.RetirementResignDocs) + // { + // var _doc = new + // { + // FileName = doc.FileName, + // PathName = await _documentService.ImagesPath(doc.Id), + // doc.Id, + // }; + // retirementResignDocs.Add(_doc); + // } + // var _data = new + // { + // data.Id, + // data.profileId, + // data.prefix, + // // data.PrefixId, + // data.firstName, + // data.lastName, + // data.Location, + // data.SendDate, + // data.ActiveDate, + // data.Reason, + // data.Remark, + // data.Status, + // data.salary, + // data.PositionTypeOld, + // data.PositionLevelOld, + // data.PositionNumberOld, + // data.OrganizationPositionOld, + // data.ApproveReason, + // data.RejectReason, + // data.IsActive, + // data.CreatedAt, + // data.OligarchReject, + // data.OligarchApproveReason, + // data.OligarchRejectReason, + // data.OligarchRejectDate, + // data.CommanderReject, + // data.CommanderApproveReason, + // data.CommanderRejectReason, + // data.CommanderRejectDate, + // data.OfficerReject, + // data.OfficerApproveReason, + // data.OfficerRejectReason, + // data.OfficerRejectDate, + // data.RemarkHorizontal, + // data.rootOld, + // data.rootOldId, + // data.rootShortNameOld, + // data.child1Old, + // data.child1OldId, + // data.child1ShortNameOld, + // data.child2Old, + // data.child2OldId, + // data.child2ShortNameOld, + // data.child3Old, + // data.child3OldId, + // data.child3ShortNameOld, + // data.child4Old, + // data.child4OldId, + // data.child4ShortNameOld, + // data.PositionOld, + // data.posMasterNoOld, + // data.posTypeOldId, + // data.posTypeNameOld, + // data.posLevelOldId, + // data.posLevelNameOld, + // data.IsNoDebt, + // data.IsNoBurden, + // data.IsDiscipline, + // data.CancelReason, + // data.idMain, + // data.statusMain, + // data.KeycloakUserId, + // data.ApproveStep, + // data.Group, + // data.Approvers, + // data.Commanders, + // statusCancel = data.Status, + // Docs = retirementResignDocs, + // }; + // return Success(_data); + // } } /// diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs index d6cde482..d35c0af0 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs @@ -286,8 +286,8 @@ namespace BMA.EHR.Retirement.Service.Controllers if (dataMain == null) return Error(GlobalMessages.RetirementResignEmployeeNotFound, 404); - if (dataMain.IsCancel != true) - { + // if (dataMain.IsCancel != true) + // { var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "SYS_RESIGN_EMP"); var createdUserId = await _context.RetirementResignEmployees.AsQueryable() .Where(x => x.Id == id) @@ -461,181 +461,181 @@ namespace BMA.EHR.Retirement.Service.Controllers }; return Success(_data); - } - else - { - var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "RETIREMENT_CANCEL_EMP"); - var createdUserId = await _context.RetirementResignEmployeeCancels.AsQueryable() - .Where(x => x.CreatedUserId == UserId) - .Where(x => x.RetirementResignEmployee.Id == id) - .FirstOrDefaultAsync(); - if (getWorkflow == false && createdUserId == null) - { - var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_RESIGN_EMP"); - var jsonData = JsonConvert.DeserializeObject(getPermission); - if (jsonData["status"]?.ToString() != "200") - { - return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); - } - } - var data = await _context.RetirementResignEmployeeCancels.AsQueryable() - .Where(x => x.RetirementResignEmployee.Id == id) - .Select(p => new - { - p.Id, - p.prefix, - p.firstName, - p.lastName, - p.profileId, - p.Location, - p.SendDate, - p.ActiveDate, - p.Reason, - p.Remark, - p.Status, - salary = p.AmountOld, - p.ApproveReason, - p.RejectReason, - p.IsActive, - p.CreatedAt, - p.PositionTypeOld, - p.PositionLevelOld, - p.PositionNumberOld, - p.OrganizationPositionOld, - p.OligarchReject, - p.OligarchApproveReason, - p.OligarchRejectReason, - p.OligarchRejectDate, - p.CommanderReject, - p.CommanderApproveReason, - p.CommanderRejectReason, - p.CommanderRejectDate, - p.OfficerReject, - p.OfficerApproveReason, - p.OfficerRejectReason, - p.OfficerRejectDate, - p.RemarkHorizontal, - p.rootOld, - p.rootOldId, - p.rootShortNameOld, - p.child1Old, - p.child1OldId, - p.child1ShortNameOld, - p.child2Old, - p.child2OldId, - p.child2ShortNameOld, - p.child3Old, - p.child3OldId, - p.child3ShortNameOld, - p.child4Old, - p.child4OldId, - p.child4ShortNameOld, - p.PositionOld, - p.posMasterNoOld, - p.posTypeOldId, - p.posTypeNameOld, - p.posLevelOldId, - p.posLevelNameOld, - p.IsNoDebt, - p.IsNoBurden, - p.IsDiscipline, - p.ApproveStep, - p.Group, - Approvers = p.Approvers.Where(x => x.ApproveType.ToUpper() == "APPROVER"), - Commanders = p.Approvers.Where(x => x.ApproveType.ToUpper() == "COMMANDER"), - KeycloakUserId = p.CreatedUserId, - p.CancelReason, - idMain = p.RetirementResignEmployee.Id, - statusMain = p.RetirementResignEmployee.Status, - RetirementResignEmployeeDocs = p.RetirementResignEmployee.RetirementResignEmployeeDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }), - }) - .FirstOrDefaultAsync(); - if (data == null) - return Error(GlobalMessages.RetirementResignEmployeeNotFound, 404); + // } + // else + // { + // var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "RETIREMENT_CANCEL_EMP"); + // var createdUserId = await _context.RetirementResignEmployeeCancels.AsQueryable() + // .Where(x => x.CreatedUserId == UserId) + // .Where(x => x.RetirementResignEmployee.Id == id) + // .FirstOrDefaultAsync(); + // if (getWorkflow == false && createdUserId == null) + // { + // var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_RESIGN_EMP"); + // var jsonData = JsonConvert.DeserializeObject(getPermission); + // if (jsonData["status"]?.ToString() != "200") + // { + // return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); + // } + // } + // var data = await _context.RetirementResignEmployeeCancels.AsQueryable() + // .Where(x => x.RetirementResignEmployee.Id == id) + // .Select(p => new + // { + // p.Id, + // p.prefix, + // p.firstName, + // p.lastName, + // p.profileId, + // p.Location, + // p.SendDate, + // p.ActiveDate, + // p.Reason, + // p.Remark, + // p.Status, + // salary = p.AmountOld, + // p.ApproveReason, + // p.RejectReason, + // p.IsActive, + // p.CreatedAt, + // p.PositionTypeOld, + // p.PositionLevelOld, + // p.PositionNumberOld, + // p.OrganizationPositionOld, + // p.OligarchReject, + // p.OligarchApproveReason, + // p.OligarchRejectReason, + // p.OligarchRejectDate, + // p.CommanderReject, + // p.CommanderApproveReason, + // p.CommanderRejectReason, + // p.CommanderRejectDate, + // p.OfficerReject, + // p.OfficerApproveReason, + // p.OfficerRejectReason, + // p.OfficerRejectDate, + // p.RemarkHorizontal, + // p.rootOld, + // p.rootOldId, + // p.rootShortNameOld, + // p.child1Old, + // p.child1OldId, + // p.child1ShortNameOld, + // p.child2Old, + // p.child2OldId, + // p.child2ShortNameOld, + // p.child3Old, + // p.child3OldId, + // p.child3ShortNameOld, + // p.child4Old, + // p.child4OldId, + // p.child4ShortNameOld, + // p.PositionOld, + // p.posMasterNoOld, + // p.posTypeOldId, + // p.posTypeNameOld, + // p.posLevelOldId, + // p.posLevelNameOld, + // p.IsNoDebt, + // p.IsNoBurden, + // p.IsDiscipline, + // p.ApproveStep, + // p.Group, + // Approvers = p.Approvers.Where(x => x.ApproveType.ToUpper() == "APPROVER"), + // Commanders = p.Approvers.Where(x => x.ApproveType.ToUpper() == "COMMANDER"), + // KeycloakUserId = p.CreatedUserId, + // p.CancelReason, + // idMain = p.RetirementResignEmployee.Id, + // statusMain = p.RetirementResignEmployee.Status, + // RetirementResignEmployeeDocs = p.RetirementResignEmployee.RetirementResignEmployeeDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }), + // }) + // .FirstOrDefaultAsync(); + // if (data == null) + // return Error(GlobalMessages.RetirementResignEmployeeNotFound, 404); - var retirementResignEmployeeDocs = new List(); - foreach (var doc in data.RetirementResignEmployeeDocs) - { - var _doc = new - { - FileName = doc.FileName, - PathName = await _documentService.ImagesPath(doc.Id), - doc.Id, - }; - retirementResignEmployeeDocs.Add(_doc); - } - var _data = new - { - data.Id, - data.profileId, - data.prefix, - data.firstName, - data.lastName, - data.Location, - data.SendDate, - data.ActiveDate, - data.Reason, - data.Remark, - data.Status, - data.salary, - data.PositionTypeOld, - data.PositionLevelOld, - data.PositionNumberOld, - data.OrganizationPositionOld, - data.ApproveReason, - data.RejectReason, - data.IsActive, - data.CreatedAt, - data.OligarchReject, - data.OligarchApproveReason, - data.OligarchRejectReason, - data.OligarchRejectDate, - data.CommanderReject, - data.CommanderApproveReason, - data.CommanderRejectReason, - data.CommanderRejectDate, - data.OfficerReject, - data.OfficerApproveReason, - data.OfficerRejectReason, - data.OfficerRejectDate, - data.RemarkHorizontal, - data.rootOld, - data.rootOldId, - data.rootShortNameOld, - data.child1Old, - data.child1OldId, - data.child1ShortNameOld, - data.child2Old, - data.child2OldId, - data.child2ShortNameOld, - data.child3Old, - data.child3OldId, - data.child3ShortNameOld, - data.child4Old, - data.child4OldId, - data.child4ShortNameOld, - data.PositionOld, - data.posMasterNoOld, - data.posTypeOldId, - data.posTypeNameOld, - data.posLevelOldId, - data.posLevelNameOld, - data.IsNoDebt, - data.IsNoBurden, - data.IsDiscipline, - data.CancelReason, - data.idMain, - data.statusMain, - data.ApproveStep, - data.Group, - data.KeycloakUserId, - data.Approvers, - data.Commanders, - statusCancel = data.Status, - Docs = retirementResignEmployeeDocs, - }; - return Success(_data); - } + // var retirementResignEmployeeDocs = new List(); + // foreach (var doc in data.RetirementResignEmployeeDocs) + // { + // var _doc = new + // { + // FileName = doc.FileName, + // PathName = await _documentService.ImagesPath(doc.Id), + // doc.Id, + // }; + // retirementResignEmployeeDocs.Add(_doc); + // } + // var _data = new + // { + // data.Id, + // data.profileId, + // data.prefix, + // data.firstName, + // data.lastName, + // data.Location, + // data.SendDate, + // data.ActiveDate, + // data.Reason, + // data.Remark, + // data.Status, + // data.salary, + // data.PositionTypeOld, + // data.PositionLevelOld, + // data.PositionNumberOld, + // data.OrganizationPositionOld, + // data.ApproveReason, + // data.RejectReason, + // data.IsActive, + // data.CreatedAt, + // data.OligarchReject, + // data.OligarchApproveReason, + // data.OligarchRejectReason, + // data.OligarchRejectDate, + // data.CommanderReject, + // data.CommanderApproveReason, + // data.CommanderRejectReason, + // data.CommanderRejectDate, + // data.OfficerReject, + // data.OfficerApproveReason, + // data.OfficerRejectReason, + // data.OfficerRejectDate, + // data.RemarkHorizontal, + // data.rootOld, + // data.rootOldId, + // data.rootShortNameOld, + // data.child1Old, + // data.child1OldId, + // data.child1ShortNameOld, + // data.child2Old, + // data.child2OldId, + // data.child2ShortNameOld, + // data.child3Old, + // data.child3OldId, + // data.child3ShortNameOld, + // data.child4Old, + // data.child4OldId, + // data.child4ShortNameOld, + // data.PositionOld, + // data.posMasterNoOld, + // data.posTypeOldId, + // data.posTypeNameOld, + // data.posLevelOldId, + // data.posLevelNameOld, + // data.IsNoDebt, + // data.IsNoBurden, + // data.IsDiscipline, + // data.CancelReason, + // data.idMain, + // data.statusMain, + // data.ApproveStep, + // data.Group, + // data.KeycloakUserId, + // data.Approvers, + // data.Commanders, + // statusCancel = data.Status, + // Docs = retirementResignEmployeeDocs, + // }; + // return Success(_data); + // } } ///