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

แก้ response probation

Browse source
This commit is contained in:
kittapath 2024-11-04 18:00:35 +07:00
parent 0df7f2ebf3
commit 6713ec6cf0
9 changed files with 539 additions and 560 deletions
Download patch file Download diff file Expand all files Collapse all files

4
BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
View file

@ -927,7 +927,7 @@ namespace BMA.EHR.Application.Repositories.Commands
response = JsonConvert.DeserializeObject<PassProbationResponse>(result); response = JsonConvert.DeserializeObject<PassProbationResponse>(result);
var seq = 1; var seq = 1;
foreach (var d in response!.data) foreach (var d in response!.result)
{ {
var _baseAPI = _configuration["API"]; var _baseAPI = _configuration["API"];
var _apiUrl = $"{_baseAPI}/org/profile/profileid/position/{d.person.id}"; var _apiUrl = $"{_baseAPI}/org/profile/profileid/position/{d.person.id}";
@ -994,7 +994,7 @@ namespace BMA.EHR.Application.Repositories.Commands
response = JsonConvert.DeserializeObject<PassProbationResponse>(result); response = JsonConvert.DeserializeObject<PassProbationResponse>(result);
var seq = 1; var seq = 1;
foreach (var d in response!.data) foreach (var d in response!.result)
{ {
var _baseAPI = _configuration["API"]; var _baseAPI = _configuration["API"];
var _apiUrl = $"{_baseAPI}/org/profile/profileid/position/{d.person.id}"; var _apiUrl = $"{_baseAPI}/org/profile/profileid/position/{d.person.id}";

956
BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs
View file

File diff suppressed because it is too large Load diff

2
BMA.EHR.Application/Responses/EvaluateAssignResponse.cs
View file

@ -5,7 +5,7 @@ namespace BMA.EHR.Application.Responses
public class EvaluateAssignResponse public class EvaluateAssignResponse
{ {
public bool successful { get; set; } public bool successful { get; set; }
public Data data { get; set; } public Data result { get; set; }
public class Data public class Data
{ {

2
BMA.EHR.Application/Responses/EvaluateChairmanAssignResponse.cs
View file

@ -5,7 +5,7 @@ namespace BMA.EHR.Application.Responses
public class EvaluateChairmanAssignResponse public class EvaluateChairmanAssignResponse
{ {
public bool successful { get; set; } public bool successful { get; set; }
public Data data { get; set; } public Data result { get; set; }
public class Data public class Data
{ {

2
BMA.EHR.Application/Responses/EvaluateRecordAssignResponse.cs
View file

@ -5,7 +5,7 @@ namespace BMA.EHR.Application.Responses
public class EvaluateRecordAssignResponse public class EvaluateRecordAssignResponse
{ {
public bool successful { get; set; } public bool successful { get; set; }
public Data data { get; set; } public Data result { get; set; }
public class Data public class Data
{ {

2
BMA.EHR.Application/Responses/EvaluateResultAssignResponse.cs
View file

@ -5,7 +5,7 @@ namespace BMA.EHR.Application.Responses
public class EvaluateResultAssignResponse public class EvaluateResultAssignResponse
{ {
public bool successful { get; set; } public bool successful { get; set; }
public Data data { get; set; } public Data result { get; set; }
public class Data public class Data
{ {

2
BMA.EHR.Application/Responses/PassProbationResponse.cs
View file

@ -4,7 +4,7 @@
{ {
public bool successful { get; set; } public bool successful { get; set; }
public List<DataResponse> data { get; set; } = new(); public List<DataResponse> result { get; set; } = new();
} }
public class DataResponse public class DataResponse

2
BMA.EHR.Application/Responses/ProbationAssignResponse.cs
View file

@ -3,7 +3,7 @@
public class ProbationAssignResponse public class ProbationAssignResponse
{ {
public bool successful { get; set; } public bool successful { get; set; }
public Data data { get; set; } public Data result { get; set; }
public class Data public class Data
{ {

35
BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
View file

@ -80,12 +80,13 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
} }
var rootId = ""; var rootId = "";
var child1Id = ""; var child1Id = "";
var child2Id = ""; var child2Id = "";
var child3Id = ""; var child3Id = "";
var child4Id = ""; var child4Id = "";
var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position"; var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position-act-main";
using (var client = new HttpClient()) using (var client = new HttpClient())
{ {
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", "")); client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
@ -93,11 +94,9 @@ namespace BMA.EHR.Placement.Service.Controllers
var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl); var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
var _res = await client.SendAsync(_req); var _res = await client.SendAsync(_req);
var _result = await _res.Content.ReadAsStringAsync(); var _result = await _res.Content.ReadAsStringAsync();
if (_res.IsSuccessStatusCode)
var org = JsonConvert.DeserializeObject<OrgRequest>(_result); {
var org = JsonConvert.DeserializeObject<OrgRequestAct>(_result);
if (org == null || org.result == null)
return Error("ไม่พบหน่วยงานของผู้ใช้งานคนนี้", 404);
rootId = org.result.rootId == null ? "" : org.result.rootId; rootId = org.result.rootId == null ? "" : org.result.rootId;
child1Id = org.result.child1Id == null ? "" : org.result.child1Id; child1Id = org.result.child1Id == null ? "" : org.result.child1Id;
child2Id = org.result.child2Id == null ? "" : org.result.child2Id; child2Id = org.result.child2Id == null ? "" : org.result.child2Id;
@ -106,7 +105,7 @@ namespace BMA.EHR.Placement.Service.Controllers
var placementOfficers = await _context.PlacementOfficers.AsQueryable() var placementOfficers = await _context.PlacementOfficers.AsQueryable()
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.Where(x => PlacementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id)))))) .Where(x => org.result.isOfficer == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id))))))
.Select(p => new .Select(p => new
{ {
p.Id, p.Id,
@ -146,27 +145,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.IsActive, p.IsActive,
}) })
.ToListAsync(); .ToListAsync();
}
// if (keyword != "")
// {
// var data = placementOfficers.Where(x =>
// (x.prefix != null && x.prefix.Contains(keyword)) ||
// (x.firstName != null && x.firstName.Contains(keyword)) ||
// (x.lastName != null && x.lastName.Contains(keyword)) ||
// (x.rootShortNameOld != null && x.rootShortNameOld.Contains(keyword)) ||
// (x.posMasterNoOld != null && x.posMasterNoOld.ToString().Contains(keyword)) ||
// (x.PositionOld != null && x.PositionOld.Contains(keyword)) ||
// (x.posTypeNameOld != null && x.posTypeNameOld.Contains(keyword)) ||
// (x.posLevelNameOld != null && x.posLevelNameOld.Contains(keyword)) ||
// (x.Organization != null && x.Organization.Contains(keyword)))
// .OrderByDescending(x => x.CreatedAt)
// .Skip((page - 1) * pageSize)
// .Take(pageSize)
// .ToList();
// placementOfficers = data;
// }
return Success(placementOfficers); return Success(placementOfficers);
} }
} }