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

Noti พนักงานผู้รับอุทธรณ์ & filter รายงานการดำเนินการทางวินัย
Some checks failed
release-dev / release-dev (push) Failing after 12s
Details

Browse source
This commit is contained in:
Bright 2025-04-08 17:44:59 +07:00
parent 221f700722
commit db20be6e50
2 changed files with 40 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs
View file

@ -401,7 +401,8 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
} }
} }
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
var apiUrlOrg = $"{baseAPIOrg}/org/workflow/find/director"; var system = "SYS_DISCIPLINE_APPEAL";
var apiUrlOrg = $"{baseAPIOrg}/org/workflow/find/director/{system}";
var refId = new List<Guid>(); var refId = new List<Guid>();
using (var client = new HttpClient()) using (var client = new HttpClient())
@ -508,7 +509,8 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
} }
} }
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
var apiUrlOrg = $"{baseAPIOrg}/org/workflow/find/director"; var system = "SYS_DISCIPLINE_APPEAL";
var apiUrlOrg = $"{baseAPIOrg}/org/workflow/find/director/{system}";
var refId = new List<Guid>(); var refId = new List<Guid>();
using (var client = new HttpClient()) using (var client = new HttpClient())

52
BMA.EHR.Discipline.Service/Controllers/DisciplineReportController.cs
View file

@ -74,20 +74,20 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
{ {
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
} }
var profile = new List<GetProfileByKeycloakIdRootDto>(); //var profile = new List<GetProfileByKeycloakIdRootDto>();
if (type.Trim().ToUpper() == "OFFICER") //if (type.Trim().ToUpper() == "OFFICER")
{ //{
profile = await _userProfileRepository.GetProfileWithKeycloakAllOfficer(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD"); // profile = await _userProfileRepository.GetProfileWithKeycloakAllOfficer(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD");
} //}
else //else
{ //{
profile = await _userProfileRepository.GetProfileWithKeycloakAllEmployee(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD"); // profile = await _userProfileRepository.GetProfileWithKeycloakAllEmployee(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD");
} //}
if (req.posLevel != null || req.posType != null) //if (req.posLevel != null || req.posType != null)
{ //{
profile = profile.Where(x => x.PositionType == req.posType || x.PositionLevel == req.posLevel).ToList(); // profile = profile.Where(x => x.PositionType == req.posType || x.PositionLevel == req.posLevel).ToList();
} //}
var data_search = await _context.DisciplineDisciplinarys var data_search = await _context.DisciplineDisciplinarys
.Include(x => x.DisciplineDisciplinary_ProfileComplaintInvestigates) .Include(x => x.DisciplineDisciplinary_ProfileComplaintInvestigates)
@ -122,9 +122,25 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
: "" : ""
: "", : "",
faultLevel = d.DisciplinaryFaultLevel, faultLevel = d.DisciplinaryFaultLevel,
Child4Id = profile.child4Id,
Child4 = profile.child4,
Child3Id = profile.child3Id,
Child3 = profile.child3,
Child2Id = profile.child2Id,
Child2 = profile.child2,
Child1Id = profile.child1Id,
Child1 = profile.child1,
RootId = profile.rootId,
Root = profile.root,
PosType = profile.posTypeName,
PosLevel = profile.posLevelName
})) }))
.Where(x => //.Where(x =>
x.citizenId != null && profile.Any(p => p.CitizenId == x.citizenId)) // x.citizenId != null && profile.Any(p => p.CitizenId == x.citizenId))
.Where(x => req.node == 4 ? x.Child4Id == req.nodeId : (req.node == 3 ? x.Child3Id == req.nodeId : (req.node == 2 ? x.Child2Id == req.nodeId : (req.node == 1 ? x.Child1Id == req.nodeId : (req.node == 0 ? x.RootId == req.nodeId : (req.node == null ? true : true))))))
.Where(x => jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD" ? true : (req.node == 0 ? x.Child1Id == null : (req.node == 1 ? x.Child2Id == null : (req.node == 2 ? x.Child3Id == null : (req.node == 3 ? x.Child4Id == null : true)))))
.Where(x => string.IsNullOrEmpty(req.posType) || x.PosType == req.posType)
.Where(x => string.IsNullOrEmpty(req.posLevel) || x.PosLevel == req.posLevel)
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.ToList(); .ToList();
@ -139,7 +155,11 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
citizenId = p.citizenId, citizenId = p.citizenId,
position = p.position, position = p.position,
posLevel = p.posLevel, posLevel = p.posLevel,
oc = profile.FirstOrDefault(x => x.CitizenId == p.citizenId)?.Oc ?? "", oc = (p.Child4 == null ? "" : p.Child4 + "\n") +
(p.Child3 == null ? "" : p.Child3 + "\n") +
(p.Child2 == null ? "" : p.Child2 + "\n") +
(p.Child1 == null ? "" : p.Child1 + "\n") +
(p.Root == null ? "" : p.Root),
offense = p.offense, offense = p.offense,
faultLevel = p.faultLevel, faultLevel = p.faultLevel,
one = 0, one = 0,