This commit is contained in:
parent
0a58075428
commit
ec04665f39
21 changed files with 546 additions and 491 deletions
|
|
@ -257,6 +257,18 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
? profileAdmin?.RootDnaId
|
||||
: "";
|
||||
}
|
||||
else if (role == "BROTHER")
|
||||
{
|
||||
nodeId = profileAdmin?.Node == 4
|
||||
? profileAdmin?.Child3DnaId
|
||||
: profileAdmin?.Node == 3
|
||||
? profileAdmin?.Child2DnaId
|
||||
: profileAdmin?.Node == 2
|
||||
? profileAdmin?.Child1DnaId
|
||||
: profileAdmin?.Node == 1 || profileAdmin?.Node == 0
|
||||
? profileAdmin?.RootDnaId
|
||||
: "";
|
||||
}
|
||||
else if (role == "ROOT" || role == "PARENT")
|
||||
{
|
||||
nodeId = profileAdmin?.RootDnaId;
|
||||
|
|
@ -312,6 +324,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
retirementResigns = retirementResigns
|
||||
.Where(x => node == 4 ? x.child4DnaOldId == nodeId : (node == 3 ? x.child3DnaOldId == nodeId : (node == 2 ? x.child2DnaOldId == nodeId : (node == 1 ? x.child1DnaOldId == nodeId : (node == 0 ? x.rootDnaOldId == nodeId : (node == null ? true : true)))))).ToList();
|
||||
}
|
||||
else if (role == "BROTHER")
|
||||
{
|
||||
retirementResigns = retirementResigns
|
||||
.Where(x => node == 4 ? x.child3DnaOldId == nodeId : (node == 3 ? x.child2DnaOldId == nodeId : (node == 2 ? x.child1DnaOldId == nodeId : (node == 1 || node == 0 ? x.rootDnaOldId == nodeId : (node == null ? true : true))))).ToList();
|
||||
}
|
||||
else if (role == "ROOT")
|
||||
{
|
||||
retirementResigns = retirementResigns
|
||||
|
|
@ -372,6 +389,18 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
? profileAdmin?.RootDnaId
|
||||
: "";
|
||||
}
|
||||
else if (role == "BROTHER")
|
||||
{
|
||||
nodeId = profileAdmin?.Node == 4
|
||||
? profileAdmin?.Child3DnaId
|
||||
: profileAdmin?.Node == 3
|
||||
? profileAdmin?.Child2DnaId
|
||||
: profileAdmin?.Node == 2
|
||||
? profileAdmin?.Child1DnaId
|
||||
: profileAdmin?.Node == 1 || profileAdmin?.Node == 0
|
||||
? profileAdmin?.RootDnaId
|
||||
: "";
|
||||
}
|
||||
else if (role == "ROOT" || role == "PARENT")
|
||||
{
|
||||
nodeId = profileAdmin?.RootDnaId;
|
||||
|
|
@ -426,6 +455,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
retirementResigns = retirementResigns
|
||||
.Where(x => node == 4 ? x.child4DnaOldId == nodeId : (node == 3 ? x.child3DnaOldId == nodeId : (node == 2 ? x.child2DnaOldId == nodeId : (node == 1 ? x.child1DnaOldId == nodeId : (node == 0 ? x.rootDnaOldId == nodeId : (node == null ? true : true)))))).ToList();
|
||||
}
|
||||
else if (role == "BROTHER")
|
||||
{
|
||||
retirementResigns = retirementResigns
|
||||
.Where(x => node == 4 ? x.child3DnaOldId == nodeId : (node == 3 ? x.child2DnaOldId == nodeId : (node == 2 ? x.child1DnaOldId == nodeId : (node == 1 || node == 0 ? x.rootDnaOldId == nodeId : (node == null ? true : true))))).ToList();
|
||||
}
|
||||
else if (role == "ROOT")
|
||||
{
|
||||
retirementResigns = retirementResigns
|
||||
|
|
@ -633,182 +667,6 @@ 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<JObject>(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<dynamic>();
|
||||
// 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);
|
||||
// }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -2149,6 +2007,18 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
? profileAdmin?.RootDnaId
|
||||
: "";
|
||||
}
|
||||
else if (role == "BROTHER")
|
||||
{
|
||||
nodeId = profileAdmin?.Node == 4
|
||||
? profileAdmin?.Child3DnaId
|
||||
: profileAdmin?.Node == 3
|
||||
? profileAdmin?.Child2DnaId
|
||||
: profileAdmin?.Node == 2
|
||||
? profileAdmin?.Child1DnaId
|
||||
: profileAdmin?.Node == 1 || profileAdmin?.Node == 0
|
||||
? profileAdmin?.RootDnaId
|
||||
: "";
|
||||
}
|
||||
else if (role == "ROOT" || role == "PARENT")
|
||||
{
|
||||
nodeId = profileAdmin?.RootDnaId;
|
||||
|
|
@ -2197,6 +2067,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
data = data
|
||||
.Where(x => node == 4 ? x.child4DnaId == nodeId : (node == 3 ? x.child3DnaId == nodeId : (node == 2 ? x.child2DnaId == nodeId : (node == 1 ? x.child1DnaId == nodeId : (node == 0 ? x.rootDnaId == nodeId : (node == null ? true : true)))))).ToList();
|
||||
}
|
||||
else if (role == "BROTHER")
|
||||
{
|
||||
data = data
|
||||
.Where(x => node == 4 ? x.child3DnaId == nodeId : (node == 3 ? x.child2DnaId == nodeId : (node == 2 ? x.child1DnaId == nodeId : (node == 1 || node == 0 ? x.rootDnaId == nodeId : (node == null ? true : true))))).ToList();
|
||||
}
|
||||
else if (role == "ROOT")
|
||||
{
|
||||
data = data
|
||||
|
|
@ -2548,12 +2423,6 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
[HttpGet("questionnaire/question")]
|
||||
public async Task<ActionResult<ResponseObject>> GetQuestionnaireQuestion()
|
||||
{
|
||||
//var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_RESIGN_INTERVIEW");
|
||||
//var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
|
||||
//if (jsonData["status"]?.ToString() != "200")
|
||||
//{
|
||||
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
|
||||
//}
|
||||
var retirementQuestionnaireQuestion = await _context.RetirementQuestionnaireQuestions.AsQueryable()
|
||||
.Select(x => new
|
||||
{
|
||||
|
|
@ -3249,12 +3118,6 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||
public async Task<ActionResult<ResponseObject>> OfficerApproveRetirementResignAsync(Guid id)
|
||||
{
|
||||
// var getPermission = await _permission.GetPermissionAPIAsync("UPDATE", "SYS_LEAVE_LIST");
|
||||
// var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
|
||||
// if (jsonData["status"]?.ToString() != "200")
|
||||
// {
|
||||
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
|
||||
// }
|
||||
await _repository.OfficerApproveRetirementResign(id);
|
||||
|
||||
return Success();
|
||||
|
|
@ -3277,12 +3140,6 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
{
|
||||
try
|
||||
{
|
||||
// var getPermission = await _permission.GetPermissionAPIAsync("UPDATE", "SYS_LEAVE_LIST");
|
||||
// var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
|
||||
// if (jsonData["status"]?.ToString() != "200")
|
||||
// {
|
||||
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
|
||||
// }
|
||||
await _repository.CommanderApproveRetirementResign(id, req.Reason ?? "", null);
|
||||
|
||||
return Success();
|
||||
|
|
@ -3311,12 +3168,6 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
{
|
||||
try
|
||||
{
|
||||
// var getPermission = await _permission.GetPermissionAPIAsync("UPDATE", "SYS_LEAVE_LIST");
|
||||
// var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
|
||||
// if (jsonData["status"]?.ToString() != "200")
|
||||
// {
|
||||
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
|
||||
// }
|
||||
await _repository.CommanderRejectRetirementResign(id, req.Reason ?? "", req.Date);
|
||||
|
||||
return Success();
|
||||
|
|
@ -3345,12 +3196,6 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
{
|
||||
try
|
||||
{
|
||||
// var getPermission = await _permission.GetPermissionAPIAsync("UPDATE", "SYS_LEAVE_LIST");
|
||||
// var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
|
||||
// if (jsonData["status"]?.ToString() != "200")
|
||||
// {
|
||||
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
|
||||
// }
|
||||
await _repository.ApproveRetirementResign(id, req.Reason ?? "", null);
|
||||
|
||||
return Success();
|
||||
|
|
@ -3379,12 +3224,6 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
{
|
||||
try
|
||||
{
|
||||
// var getPermission = await _permission.GetPermissionAPIAsync("UPDATE", "SYS_LEAVE_LIST");
|
||||
// var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
|
||||
// if (jsonData["status"]?.ToString() != "200")
|
||||
// {
|
||||
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
|
||||
// }
|
||||
await _repository.RejectRetirementResign(id, req.Reason ?? "", req.Date);
|
||||
|
||||
return Success();
|
||||
|
|
@ -3475,12 +3314,6 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||
public async Task<ActionResult<ResponseObject>> OfficerApproveRetirementResignCancelAsync(Guid id)
|
||||
{
|
||||
// var getPermission = await _permission.GetPermissionAPIAsync("UPDATE", "SYS_LEAVE_LIST");
|
||||
// var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
|
||||
// if (jsonData["status"]?.ToString() != "200")
|
||||
// {
|
||||
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
|
||||
// }
|
||||
await _repository.OfficerApproveRetirementResignCancel(id);
|
||||
|
||||
return Success();
|
||||
|
|
@ -3503,12 +3336,6 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
{
|
||||
try
|
||||
{
|
||||
// var getPermission = await _permission.GetPermissionAPIAsync("UPDATE", "SYS_LEAVE_LIST");
|
||||
// var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
|
||||
// if (jsonData["status"]?.ToString() != "200")
|
||||
// {
|
||||
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
|
||||
// }
|
||||
await _repository.CommanderApproveRetirementResignCancel(id, req.Reason ?? "", null);
|
||||
|
||||
return Success();
|
||||
|
|
@ -3537,12 +3364,6 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
{
|
||||
try
|
||||
{
|
||||
// var getPermission = await _permission.GetPermissionAPIAsync("UPDATE", "SYS_LEAVE_LIST");
|
||||
// var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
|
||||
// if (jsonData["status"]?.ToString() != "200")
|
||||
// {
|
||||
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
|
||||
// }
|
||||
await _repository.CommanderRejectRetirementResignCancel(id, req.Reason ?? "", req.Date);
|
||||
|
||||
return Success();
|
||||
|
|
@ -3571,12 +3392,6 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
{
|
||||
try
|
||||
{
|
||||
// var getPermission = await _permission.GetPermissionAPIAsync("UPDATE", "SYS_LEAVE_LIST");
|
||||
// var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
|
||||
// if (jsonData["status"]?.ToString() != "200")
|
||||
// {
|
||||
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
|
||||
// }
|
||||
await _repository.ApproveRetirementResignCancel(id, req.Reason ?? "", null);
|
||||
|
||||
return Success();
|
||||
|
|
@ -3605,12 +3420,6 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
{
|
||||
try
|
||||
{
|
||||
// var getPermission = await _permission.GetPermissionAPIAsync("UPDATE", "SYS_LEAVE_LIST");
|
||||
// var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
|
||||
// if (jsonData["status"]?.ToString() != "200")
|
||||
// {
|
||||
// return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
|
||||
// }
|
||||
await _repository.RejectRetirementResignCancel(id, req.Reason ?? "", req.Date);
|
||||
|
||||
return Success();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue