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

แก้คำสั่งบรรจุ

Browse source
This commit is contained in:
Kittapath 2024-07-01 01:30:24 +07:00
parent 7c0b7f1aa7
commit 2678b7fc59
8 changed files with 18664 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

48
BMA.EHR.Placement.Service/Controllers/NotifyController.cs
View file

@ -62,9 +62,9 @@ namespace BMA.EHR.Placement.Service.Controllers
[HttpPost()]
public async Task<ActionResult<ResponseObject>> UpdatePropertyByUser([FromBody] NotiRequest req)
{
var profile = await _context.Profiles.FirstOrDefaultAsync(x => x.Id == req.ReceiverUserId);
if (profile == null)
return Error(GlobalMessages.DataNotFound);
// var profile = await _context.Profiles.FirstOrDefaultAsync(x => x.Id == req.ReceiverUserId);
// if (profile == null)
// return Error(GlobalMessages.DataNotFound);
await _repositoryNoti.PushNotificationAsync(
req.ReceiverUserId,
@ -116,18 +116,32 @@ namespace BMA.EHR.Placement.Service.Controllers
var inbox = await _context.Inboxes.FirstOrDefaultAsync(x => x.Id == id);
if (inbox == null)
return Error(GlobalMessages.DataNotFound);
var profile = await _context.Profiles.FirstOrDefaultAsync(x => x.KeycloakId == Guid.Parse(inbox.CreatedUserId));
if (profile == null)
return Error(GlobalMessages.DataNotFound);
await _repositoryNoti.PushNotificationAsync(
profile.Id,
req.Subject,
req.Body,
req.Payload,
req.IsSendInbox,
req.IsSendMail
);
var apiUrl = $"{_configuration["API"]}org/profile/keycloak/position/{inbox.CreatedUserId}";
using (var client = new HttpClient())
{
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
var _res = await client.SendAsync(_req);
var _result = await _res.Content.ReadAsStringAsync();
var org = JsonConvert.DeserializeObject<OrgRequest>(_result);
if (org != null && org.result != null)
{
await _repositoryNoti.PushNotificationAsync(
Guid.Parse(org.result.id),
req.Subject,
req.Body,
req.Payload,
req.IsSendInbox,
req.IsSendMail
);
}
return Success();
}
// var profile = await _context.Profiles.FirstOrDefaultAsync(x => x.KeycloakId == Guid.Parse(inbox.CreatedUserId));
// if (profile == null)
// return Error(GlobalMessages.DataNotFound);
return Success();
}
@ -135,9 +149,9 @@ namespace BMA.EHR.Placement.Service.Controllers
[HttpPost("cronjob")]
public async Task<ActionResult<ResponseObject>> CornjobProbation([FromBody] NotiCronjobProbationRequest req)
{
var profile = await _context.Profiles.FirstOrDefaultAsync(x => x.Id == req.ReceiverUserId);
if (profile == null)
return Error(GlobalMessages.DataNotFound);
// var profile = await _context.Profiles.FirstOrDefaultAsync(x => x.Id == req.ReceiverUserId);
// if (profile == null)
// return Error(GlobalMessages.DataNotFound);
_context.CronjobNotiProbations.Add(new CronjobNotiProbation
{

49
BMA.EHR.Placement.Service/Controllers/PlacementController.cs
View file

@ -784,6 +784,55 @@ namespace BMA.EHR.Placement.Service.Controllers
person.posLevelId = req.posLevelId;
person.posLevelName = req.posLevelName;
apiUrl = $"{_configuration["API"]}org/profile/profileid/position/{person.profileId}";
using (var client = new HttpClient())
{
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
var _res = await client.SendAsync(_req);
var _result = await _res.Content.ReadAsStringAsync();
var org = JsonConvert.DeserializeObject<OrgRequest>(_result);
if (org == null || org.result == null)
{
person.IsOld = false;
}
else
{
// person.AmountOld = org.result.xxxxxxxx;
person.nodeOld = org.result.node;
person.nodeIdOld = org.result.nodeId;
// person.posmasterIdOld = org.result.xxxxxxxx;
person.rootOld = org.result.root;
person.rootIdOld = org.result.rootId;
person.rootShortNameOld = org.result.rootShortName;
person.child1Old = org.result.child1;
person.child1IdOld = org.result.child1Id;
person.child1ShortNameOld = org.result.child1ShortName;
person.child2Old = org.result.child2;
person.child2IdOld = org.result.child2Id;
person.child2ShortNameOld = org.result.child2ShortName;
person.child3Old = org.result.child3;
person.child3IdOld = org.result.child3Id;
person.child3ShortNameOld = org.result.child3ShortName;
person.child4Old = org.result.child4;
person.child4IdOld = org.result.child4Id;
person.child4ShortNameOld = org.result.child4ShortName;
// person.orgRevisionIdOld = org.result.xxxxxxx;
// person.positionIdOld = org.result.xxxxxxx;
person.posMasterNoOld = org.result.posMasterNo;
person.positionNameOld = org.result.position;
// person.positionFieldOld = org.result.xxxxxxx;
person.posTypeIdOld = org.result.posTypeId;
person.posTypeNameOld = org.result.posTypeName;
person.posLevelIdOld = org.result.posLevelId;
person.posLevelNameOld = org.result.posLevelName;
}
}
person.PlacementStatus = "PREPARE-CONTAIN";
person.LastUpdateFullName = FullName ?? "System Administrator";
person.LastUpdateUserId = UserId ?? "";

1
BMA.EHR.Placement.Service/Requests/OrgRequest.cs
View file

@ -9,6 +9,7 @@ namespace BMA.EHR.Placement.Service.Requests
}
public class OrgRequestData
{
public string? id { get; set; }
public string? profileId { get; set; }
public string? prefix { get; set; }
public string? firstName { get; set; }