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-06-14 17:26:15 +07:00
parent ee2aa136b9
commit 6c09c68c5c
33 changed files with 18908 additions and 626 deletions
Download patch file Download diff file Expand all files Collapse all files

33
BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
View file

@ -90,7 +90,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
var _res = await client.SendAsync(_req);
var _result = await _res.Content.ReadAsStringAsync();
var org = JsonConvert.DeserializeObject<OrgRequest>(_result);
var org = JsonConvert.DeserializeObject<Requests.OrgRequest>(_result);
if (org == null || org.result == null)
return Error("ไม่พบหน่วยงานของผู้ใช้งานคนนี้", 404);
@ -286,7 +286,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
var _res = await client.SendAsync(_req);
var _result = await _res.Content.ReadAsStringAsync();
var org = JsonConvert.DeserializeObject<OrgRequest>(_result);
var org = JsonConvert.DeserializeObject<Requests.OrgRequest>(_result);
if (org == null || org.result == null)
return Error("ไม่พบหน่วยงานของผู้ใช้งานคนนี้", 404);
@ -320,6 +320,23 @@ namespace BMA.EHR.Retirement.Service.Controllers
}
await _context.RetirementDeceaseds.AddAsync(retirementDeceased);
await _context.SaveChangesAsync();
var _baseAPI = _configuration["API"];
var _apiUrl = $"{_baseAPI}/org/profile/leave/{req.ProfileId}";
using (var client = new HttpClient())
{
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
var _req = new HttpRequestMessage(HttpMethod.Post, _apiUrl);
var _res = await client.PostAsJsonAsync(_apiUrl, new
{
isLeave = true,
leaveReason = "ถึงแก่กรรม",
leaveDate = req.Date,
});
var _result = await _res.Content.ReadAsStringAsync();
}
var _doc = new Domain.Models.Documents.Document();
if (Request.Form.Files != null && Request.Form.Files.Count != 0)
{
@ -384,15 +401,15 @@ namespace BMA.EHR.Retirement.Service.Controllers
// {
retirementDeceased.RetirementDeceasedNotis.Add(new RetirementDeceasedNoti
{
CitizenId = retirementDeceased.citizenId,
Prefix = retirementDeceased.prefix,
FirstName = retirementDeceased.firstName,
LastName = retirementDeceased.lastName,
CitizenId = retirementDeceased.citizenId == null ? "" : retirementDeceased.citizenId,
Prefix = retirementDeceased.prefix == null ? "" : retirementDeceased.prefix,
FirstName = retirementDeceased.firstName == null ? "" : retirementDeceased.firstName,
LastName = retirementDeceased.lastName == null ? "" : retirementDeceased.lastName,
IsSendMail = true,
IsSendInbox = true,
IsSendNotification = true,
// OrganizationName = retirementDeceased.OrganizationName,
PositionName = retirementDeceased.position,
PositionName = retirementDeceased.position == null ? "" : retirementDeceased.position,
profileId = req.ProfileId,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
@ -557,7 +574,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
var _res = await client.SendAsync(_req);
var _result = await _res.Content.ReadAsStringAsync();
var org = JsonConvert.DeserializeObject<OrgRequest>(_result);
var org = JsonConvert.DeserializeObject<Requests.OrgRequest>(_result);
if (org == null || org.result == null)
continue;

1
BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
View file

@ -343,6 +343,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOther.posLevelOldId = org.result.posLevelId;
retirementOther.posLevelNameOld = org.result.posLevelName;
retirementOther.LeaveDate = org.result.leaveDate;
retirementOther.PositionOld = org.result.position;
retirementOther.PositionLevelOld = org.result.posLevelName;
retirementOther.PositionTypeOld = org.result.posTypeName;

4
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -269,6 +269,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.posLevelOldId,
p.posLevelNameOld,
p.IsNoDebt,
p.IsNoBurden,
p.IsDiscipline,
// Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id,
RetirementResignDocs = p.RetirementResignDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
// RetirementResignDebtDocs = p.RetirementResignDebtDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
@ -356,6 +358,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.posLevelOldId,
data.posLevelNameOld,
data.IsNoDebt,
data.IsNoBurden,
data.IsDiscipline,
// Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar),
Docs = retirementResignDocs,
// DocDebts = retirementResignDebtDocs,