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

Merge branch 'develop' into develop-Bright

Browse source
This commit is contained in:
Bright 2024-10-18 17:41:45 +07:00
commit cf56ef9297
13 changed files with 201 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -63,13 +63,14 @@ namespace BMA.EHR.Placement.Service.Controllers
public async Task<ActionResult<ResponseObject>> UpdatePropertyByUser([FromBody] NotiRequest req)
{
await _repositoryNoti.PushNotificationAsync(
Guid.Parse(req.ReceiverUserId),
Guid.Parse(req.ReceiverUserId),
req.Subject,
req.Body,
req.Payload,
"",
req.IsSendInbox,
req.IsSendMail
);
);
return Success();
}
@ -93,6 +94,7 @@ namespace BMA.EHR.Placement.Service.Controllers
req.Subject,
req.Body,
req.Payload,
"",
req.IsSendInbox,
req.IsSendMail
);
@ -111,6 +113,7 @@ namespace BMA.EHR.Placement.Service.Controllers
req.Subject,
req.Body,
req.Payload,
"",
req.IsSendInbox,
req.IsSendMail
);
@ -121,8 +124,8 @@ namespace BMA.EHR.Placement.Service.Controllers
[HttpPost("profiles")]
public async Task<ActionResult<ResponseObject>> UpdatePropertyByUserProfiles([FromBody] NotisRequest req)
{
await _repositoryNoti.PushNotificationsAsync(
req.ReceiverUserIds.Select(x => Guid.Parse(x)).ToArray(),
await _repositoryNoti.PushNotificationsLinkAsync(
req.ReceiverUserIds,
req.Subject,
req.Body,
req.Payload,
@ -157,9 +160,10 @@ namespace BMA.EHR.Placement.Service.Controllers
req.Subject,
req.Body,
req.Payload,
"",
req.IsSendInbox,
req.IsSendMail
);
);
}
return Success();
}

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

@ -1683,6 +1683,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{
profileId = string.Empty,
date = r.commandAffectDate,
commandId = r.commandId,
amount = r.amount,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,