แก้ระบบบรรจุผูกโครงสร้างใหม่
This commit is contained in:
parent
57164f5d45
commit
18d75f4b04
37 changed files with 79295 additions and 3904 deletions
|
|
@ -16,6 +16,7 @@ using Microsoft.AspNetCore.Mvc;
|
|||
using Microsoft.EntityFrameworkCore;
|
||||
using Newtonsoft.Json;
|
||||
using Swashbuckle.AspNetCore.Annotations;
|
||||
using System.Net.Http.Headers;
|
||||
using System.Reflection.Metadata;
|
||||
using System.Security.Claims;
|
||||
using System.Security.Cryptography;
|
||||
|
|
@ -60,7 +61,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
private string? UserId => _httpContextAccessor?.HttpContext?.User?.FindFirst(ClaimTypes.NameIdentifier)?.Value;
|
||||
|
||||
private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value;
|
||||
private string? token => _httpContextAccessor?.HttpContext?.Request.Headers["Authorization"];
|
||||
|
||||
private bool? RetirementAdmin => _httpContextAccessor?.HttpContext?.User?.IsInRole("placement1");
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -74,64 +77,87 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
[HttpGet()]
|
||||
public async Task<ActionResult<ResponseObject>> GetList()
|
||||
{
|
||||
|
||||
var retirementDeceaseds = await _context.RetirementDeceaseds.AsQueryable()
|
||||
.OrderByDescending(x => x.CreatedAt)
|
||||
.Select(p => new
|
||||
{
|
||||
p.Id,
|
||||
ProfileId = p.Profile.Id,
|
||||
Prefix = p.Profile.Prefix == null ? null : p.Profile.Prefix.Name,
|
||||
p.Profile.FirstName,
|
||||
p.Profile.LastName,
|
||||
Position = p.Profile.Position == null ? null : p.Profile.Position.Name,
|
||||
PositionType = p.Profile.PositionType == null ? null : p.Profile.PositionType.Name,
|
||||
p.Profile.PositionLine,
|
||||
// PositionLine = p.Profile.PositionLine == null ? null : p.Profile.PositionLine.Name,
|
||||
PositionLevel = p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name,
|
||||
p.Profile.PositionExecutive,
|
||||
// PositionExecutive = p.Profile.PositionExecutive == null ? null : p.Profile.PositionExecutive.Name,
|
||||
Organization = p.Profile.Oc,
|
||||
// Organization = p.Profile.Oc == null ? null : p.Profile.Oc.Name,
|
||||
p.Number,
|
||||
p.Date,
|
||||
p.Location,
|
||||
p.Reason,
|
||||
FileName = p.Document == null ? null : p.Document.FileName,
|
||||
PathName = p.Document == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Document.Id,
|
||||
p.IsActive,
|
||||
p.CreatedAt,
|
||||
})
|
||||
.ToListAsync();
|
||||
var _retirementDeceaseds = new List<dynamic>();
|
||||
foreach (var data in retirementDeceaseds)
|
||||
var rootId = "";
|
||||
var child1Id = "";
|
||||
var child2Id = "";
|
||||
var child3Id = "";
|
||||
var child4Id = "";
|
||||
var apiUrl = $"{_configuration["API"]}org/profile/keycloak/position";
|
||||
using (var client = new HttpClient())
|
||||
{
|
||||
var _data = new
|
||||
{
|
||||
data.Id,
|
||||
data.ProfileId,
|
||||
data.Prefix,
|
||||
data.FirstName,
|
||||
data.LastName,
|
||||
data.Position,
|
||||
data.PositionExecutive,
|
||||
data.PositionType,
|
||||
data.PositionLine,
|
||||
data.PositionLevel,
|
||||
data.Organization,
|
||||
data.Number,
|
||||
data.Date,
|
||||
data.Location,
|
||||
data.Reason,
|
||||
data.FileName,
|
||||
PathName = data.PathName == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.PathName),
|
||||
data.IsActive,
|
||||
data.CreatedAt,
|
||||
};
|
||||
_retirementDeceaseds.Add(_data);
|
||||
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)
|
||||
return Error("ไม่พบหน่วยงานของผู้ใช้งานคนนี้", 404);
|
||||
rootId = org.result.rootId == null ? "" : org.result.rootId;
|
||||
child1Id = org.result.child1Id == null ? "" : org.result.child1Id;
|
||||
child2Id = org.result.child2Id == null ? "" : org.result.child2Id;
|
||||
child3Id = org.result.child3Id == null ? "" : org.result.child3Id;
|
||||
child4Id = org.result.child4Id == null ? "" : org.result.child4Id;
|
||||
|
||||
var retirementDeceaseds = await _context.RetirementDeceaseds.AsQueryable()
|
||||
.OrderByDescending(x => x.CreatedAt)
|
||||
.Where(x => RetirementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))))
|
||||
.Select(p => new
|
||||
{
|
||||
p.Id,
|
||||
p.profileId,
|
||||
p.prefix,
|
||||
p.firstName,
|
||||
p.lastName,
|
||||
p.root,
|
||||
p.rootShortName,
|
||||
p.child1,
|
||||
p.child1ShortName,
|
||||
p.child2,
|
||||
p.child2ShortName,
|
||||
p.child3,
|
||||
p.child3ShortName,
|
||||
p.child4,
|
||||
p.child4ShortName,
|
||||
p.posMasterNo,
|
||||
p.position,
|
||||
p.posLevelName,
|
||||
p.posTypeName,
|
||||
p.CreatedAt,
|
||||
p.IsActive,
|
||||
})
|
||||
.ToListAsync();
|
||||
// var _retirementDeceaseds = new List<dynamic>();
|
||||
// foreach (var data in retirementDeceaseds)
|
||||
// {
|
||||
// var _data = new
|
||||
// {
|
||||
// data.Id,
|
||||
// data.ProfileId,
|
||||
// data.Prefix,
|
||||
// data.FirstName,
|
||||
// data.LastName,
|
||||
// data.Position,
|
||||
// data.PositionExecutive,
|
||||
// data.PositionType,
|
||||
// data.PositionLine,
|
||||
// data.PositionLevel,
|
||||
// data.Organization,
|
||||
// data.Number,
|
||||
// data.Date,
|
||||
// data.Location,
|
||||
// data.Reason,
|
||||
// data.FileName,
|
||||
// PathName = data.PathName == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.PathName),
|
||||
// data.IsActive,
|
||||
// data.CreatedAt,
|
||||
// };
|
||||
// _retirementDeceaseds.Add(_data);
|
||||
// }
|
||||
return Success(retirementDeceaseds);
|
||||
}
|
||||
|
||||
return Success(_retirementDeceaseds);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -151,26 +177,24 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
.Select(p => new
|
||||
{
|
||||
p.Id,
|
||||
ProfileId = p.Profile.Id,
|
||||
Prefix = p.Profile.Prefix == null ? null : p.Profile.Prefix.Name,
|
||||
PrefixId = p.Profile.Prefix == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Prefix.Id,
|
||||
p.Profile.FirstName,
|
||||
p.Profile.LastName,
|
||||
Position = p.Profile.Position == null ? null : p.Profile.Position.Name,
|
||||
PositionId = p.Profile.Position == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Position.Id,
|
||||
PositionType = p.Profile.PositionType == null ? null : p.Profile.PositionType.Name,
|
||||
PositionTypeId = p.Profile.PositionType == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.PositionType.Id,
|
||||
p.Profile.PositionLine,
|
||||
p.Profile.PositionLineId,
|
||||
// PositionLine = p.Profile.PositionLine == null ? null : p.Profile.PositionLine.Name,
|
||||
PositionLevel = p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name,
|
||||
PositionLevelId = p.Profile.PositionLevel == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.PositionLevel.Id,
|
||||
p.Profile.PositionExecutive,
|
||||
p.Profile.PositionExecutiveId,
|
||||
// PositionExecutive = p.Profile.PositionExecutive == null ? null : p.Profile.PositionExecutive.Name,
|
||||
Organization = p.Profile.Oc,
|
||||
OrganizationId = p.Profile.OcId,
|
||||
// Organization = p.Profile.Oc == null ? null : p.Profile.Oc.Name,
|
||||
p.profileId,
|
||||
p.prefix,
|
||||
p.firstName,
|
||||
p.lastName,
|
||||
p.root,
|
||||
p.rootShortName,
|
||||
p.child1,
|
||||
p.child1ShortName,
|
||||
p.child2,
|
||||
p.child2ShortName,
|
||||
p.child3,
|
||||
p.child3ShortName,
|
||||
p.child4,
|
||||
p.child4ShortName,
|
||||
p.posMasterNo,
|
||||
p.position,
|
||||
p.posLevelName,
|
||||
p.posTypeName,
|
||||
p.Number,
|
||||
p.Date,
|
||||
p.Location,
|
||||
|
|
@ -179,7 +203,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
PathName = p.Document == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Document.Id,
|
||||
p.IsActive,
|
||||
p.CreatedAt,
|
||||
Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id,
|
||||
// Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id,
|
||||
})
|
||||
.FirstOrDefaultAsync();
|
||||
if (data == null)
|
||||
|
|
@ -187,32 +211,32 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
var _data = new
|
||||
{
|
||||
data.Id,
|
||||
data.ProfileId,
|
||||
data.Prefix,
|
||||
data.PrefixId,
|
||||
data.FirstName,
|
||||
data.LastName,
|
||||
data.Position,
|
||||
data.PositionExecutive,
|
||||
data.PositionType,
|
||||
data.PositionLine,
|
||||
data.PositionLevel,
|
||||
data.Organization,
|
||||
data.PositionId,
|
||||
data.PositionExecutiveId,
|
||||
data.PositionTypeId,
|
||||
data.PositionLineId,
|
||||
data.PositionLevelId,
|
||||
data.OrganizationId,
|
||||
data.profileId,
|
||||
data.prefix,
|
||||
data.firstName,
|
||||
data.lastName,
|
||||
data.root,
|
||||
data.rootShortName,
|
||||
data.child1,
|
||||
data.child1ShortName,
|
||||
data.child2,
|
||||
data.child2ShortName,
|
||||
data.child3,
|
||||
data.child3ShortName,
|
||||
data.child4,
|
||||
data.child4ShortName,
|
||||
data.posMasterNo,
|
||||
data.position,
|
||||
data.posLevelName,
|
||||
data.posTypeName,
|
||||
data.Number,
|
||||
data.Date,
|
||||
data.Location,
|
||||
data.Reason,
|
||||
data.FileName,
|
||||
PathName = data.PathName == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.PathName),
|
||||
data.IsActive,
|
||||
data.CreatedAt,
|
||||
Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar),
|
||||
// Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar),
|
||||
};
|
||||
|
||||
return Success(_data);
|
||||
|
|
@ -229,18 +253,19 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
[HttpPost()]
|
||||
public async Task<ActionResult<ResponseObject>> Post([FromForm] RetirementDeceasedRequest req)
|
||||
{
|
||||
var profile = await _context.Profiles
|
||||
.Include(x => x.Prefix)
|
||||
.FirstOrDefaultAsync(x => x.Id == req.ProfileId);
|
||||
if (profile == null)
|
||||
return Error(GlobalMessages.DataNotFound, 404);
|
||||
profile.LeaveDate = DateTime.Now;
|
||||
profile.IsLeave = true;
|
||||
profile.LeaveReason = "DEATH";
|
||||
// var profile = await _context.Profiles
|
||||
// .Include(x => x.Prefix)
|
||||
// .FirstOrDefaultAsync(x => x.Id == req.ProfileId);
|
||||
// if (profile == null)
|
||||
// return Error(GlobalMessages.DataNotFound, 404);
|
||||
|
||||
// profile.LeaveDate = DateTime.Now;
|
||||
// profile.IsLeave = true;
|
||||
// profile.LeaveReason = "DEATH";
|
||||
|
||||
var retirementDeceased = new RetirementDeceased
|
||||
{
|
||||
Profile = profile,
|
||||
// Profile = profile,
|
||||
Number = req.Number,
|
||||
Date = req.Date,
|
||||
Location = req.Location,
|
||||
|
|
@ -253,6 +278,46 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
LastUpdateUserId = UserId ?? "",
|
||||
LastUpdatedAt = DateTime.Now,
|
||||
};
|
||||
var apiUrl = $"{_configuration["API"]}org/profile/profileid/position/{req.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)
|
||||
return Error("ไม่พบหน่วยงานของผู้ใช้งานคนนี้", 404);
|
||||
|
||||
retirementDeceased.profileId = org.result.profileId;
|
||||
retirementDeceased.prefix = org.result.prefix;
|
||||
retirementDeceased.firstName = org.result.firstName;
|
||||
retirementDeceased.lastName = org.result.lastName;
|
||||
retirementDeceased.citizenId = org.result.citizenId;
|
||||
retirementDeceased.root = org.result.root;
|
||||
retirementDeceased.rootId = org.result.rootId;
|
||||
retirementDeceased.rootShortName = org.result.rootShortName;
|
||||
retirementDeceased.child1 = org.result.child1;
|
||||
retirementDeceased.child1Id = org.result.child1Id;
|
||||
retirementDeceased.child1ShortName = org.result.child1ShortName;
|
||||
retirementDeceased.child2 = org.result.child2;
|
||||
retirementDeceased.child2Id = org.result.child2Id;
|
||||
retirementDeceased.child2ShortName = org.result.child2ShortName;
|
||||
retirementDeceased.child3 = org.result.child3;
|
||||
retirementDeceased.child3Id = org.result.child3Id;
|
||||
retirementDeceased.child3ShortName = org.result.child3ShortName;
|
||||
retirementDeceased.child4 = org.result.child4;
|
||||
retirementDeceased.child4Id = org.result.child4Id;
|
||||
retirementDeceased.child4ShortName = org.result.child4ShortName;
|
||||
retirementDeceased.posMasterNo = org.result.posMasterNo;
|
||||
retirementDeceased.position = org.result.position;
|
||||
retirementDeceased.posTypeId = org.result.posTypeId;
|
||||
retirementDeceased.posTypeName = org.result.posTypeName;
|
||||
retirementDeceased.posLevelId = org.result.posLevelId;
|
||||
retirementDeceased.posLevelName = org.result.posLevelName;
|
||||
}
|
||||
await _context.RetirementDeceaseds.AddAsync(retirementDeceased);
|
||||
await _context.SaveChangesAsync();
|
||||
var _doc = new Domain.Models.Documents.Document();
|
||||
|
|
@ -267,16 +332,68 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
if (_doc != null)
|
||||
retirementDeceased.Document = _doc;
|
||||
}
|
||||
await _context.ProfileSalaries.AddAsync(new ProfileSalary
|
||||
// await _context.ProfileSalaries.AddAsync(new ProfileSalary
|
||||
// {
|
||||
// Date = req.Date,
|
||||
// SalaryRef = req.Number,
|
||||
// CommandNo = "-",
|
||||
// SalaryClass = "-",
|
||||
// PosNoEmployee = "-",
|
||||
// CommandTypeName = "-",
|
||||
// SalaryStatus = "DEATH",
|
||||
// Profile = profile,
|
||||
// CreatedFullName = FullName ?? "System Administrator",
|
||||
// CreatedUserId = UserId ?? "",
|
||||
// CreatedAt = DateTime.Now,
|
||||
// LastUpdateFullName = FullName ?? "System Administrator",
|
||||
// LastUpdateUserId = UserId ?? "",
|
||||
// LastUpdatedAt = DateTime.Now,
|
||||
// });
|
||||
// if (_doc != null)
|
||||
// {
|
||||
// await _context.ProfilePapers.AddAsync(new ProfilePaper
|
||||
// {
|
||||
// Detail = "ถึงแก่กรรม",
|
||||
// CategoryName = "DEATH",
|
||||
// Document = _doc,
|
||||
// Profile = profile,
|
||||
// CreatedFullName = FullName ?? "System Administrator",
|
||||
// CreatedUserId = UserId ?? "",
|
||||
// CreatedAt = DateTime.Now,
|
||||
// LastUpdateFullName = FullName ?? "System Administrator",
|
||||
// LastUpdateUserId = UserId ?? "",
|
||||
// LastUpdatedAt = DateTime.Now,
|
||||
// });
|
||||
// }
|
||||
// var orgPos = await _context.ProfilePositions
|
||||
// .Include(x => x.Profile)
|
||||
// .ThenInclude(x => x!.Prefix)
|
||||
// .Include(x => x.OrganizationPosition)
|
||||
// .ThenInclude(x => x!.Organization)
|
||||
// .ThenInclude(x => x!.OrganizationOrganization)
|
||||
// .Include(x => x.OrganizationPosition)
|
||||
// .ThenInclude(x => x!.PositionMaster)
|
||||
// .ThenInclude(x => x!.PositionPath)
|
||||
// .Where(x => x.OrganizationPosition!.IsDirector! == true)
|
||||
// .Where(x => x.OrganizationPosition!.Organization!.Id == profile.OcId)
|
||||
// .FirstOrDefaultAsync();
|
||||
|
||||
// if (orgPos != null)
|
||||
// {
|
||||
// if (orgPos.Profile != null)
|
||||
// {
|
||||
retirementDeceased.RetirementDeceasedNotis.Add(new RetirementDeceasedNoti
|
||||
{
|
||||
Date = req.Date,
|
||||
SalaryRef = req.Number,
|
||||
CommandNo = "-",
|
||||
SalaryClass = "-",
|
||||
PosNoEmployee = "-",
|
||||
CommandTypeName = "-",
|
||||
SalaryStatus = "DEATH",
|
||||
Profile = profile,
|
||||
CitizenId = retirementDeceased.citizenId,
|
||||
Prefix = retirementDeceased.prefix,
|
||||
FirstName = retirementDeceased.firstName,
|
||||
LastName = retirementDeceased.lastName,
|
||||
IsSendMail = true,
|
||||
IsSendInbox = true,
|
||||
IsSendNotification = true,
|
||||
// OrganizationName = retirementDeceased.OrganizationName,
|
||||
// PositionName = retirementDeceased.PositionName,
|
||||
// ReceiveUser = profile,
|
||||
CreatedFullName = FullName ?? "System Administrator",
|
||||
CreatedUserId = UserId ?? "",
|
||||
CreatedAt = DateTime.Now,
|
||||
|
|
@ -284,60 +401,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
LastUpdateUserId = UserId ?? "",
|
||||
LastUpdatedAt = DateTime.Now,
|
||||
});
|
||||
if (_doc != null)
|
||||
{
|
||||
await _context.ProfilePapers.AddAsync(new ProfilePaper
|
||||
{
|
||||
Detail = "ถึงแก่กรรม",
|
||||
CategoryName = "DEATH",
|
||||
Document = _doc,
|
||||
Profile = profile,
|
||||
CreatedFullName = FullName ?? "System Administrator",
|
||||
CreatedUserId = UserId ?? "",
|
||||
CreatedAt = DateTime.Now,
|
||||
LastUpdateFullName = FullName ?? "System Administrator",
|
||||
LastUpdateUserId = UserId ?? "",
|
||||
LastUpdatedAt = DateTime.Now,
|
||||
});
|
||||
}
|
||||
var orgPos = await _context.ProfilePositions
|
||||
.Include(x => x.Profile)
|
||||
.ThenInclude(x => x!.Prefix)
|
||||
.Include(x => x.OrganizationPosition)
|
||||
.ThenInclude(x => x!.Organization)
|
||||
.ThenInclude(x => x!.OrganizationOrganization)
|
||||
.Include(x => x.OrganizationPosition)
|
||||
.ThenInclude(x => x!.PositionMaster)
|
||||
.ThenInclude(x => x!.PositionPath)
|
||||
.Where(x => x.OrganizationPosition!.IsDirector! == true)
|
||||
.Where(x => x.OrganizationPosition!.Organization!.Id == profile.OcId)
|
||||
.FirstOrDefaultAsync();
|
||||
|
||||
if (orgPos != null)
|
||||
{
|
||||
if (orgPos.Profile != null)
|
||||
{
|
||||
retirementDeceased.RetirementDeceasedNotis.Add(new RetirementDeceasedNoti
|
||||
{
|
||||
CitizenId = orgPos!.Profile!.CitizenId!,
|
||||
Prefix = orgPos!.Profile!.Prefix!.Name,
|
||||
FirstName = orgPos!.Profile!.FirstName!,
|
||||
LastName = orgPos!.Profile!.LastName!,
|
||||
IsSendMail = true,
|
||||
IsSendInbox = true,
|
||||
IsSendNotification = true,
|
||||
OrganizationName = orgPos!.OrganizationPosition!.Organization!.OrganizationOrganization!.Name,
|
||||
PositionName = orgPos!.OrganizationPosition!.PositionMaster!.PositionPath!.Name,
|
||||
ReceiveUser = profile,
|
||||
CreatedFullName = FullName ?? "System Administrator",
|
||||
CreatedUserId = UserId ?? "",
|
||||
CreatedAt = DateTime.Now,
|
||||
LastUpdateFullName = FullName ?? "System Administrator",
|
||||
LastUpdateUserId = UserId ?? "",
|
||||
LastUpdatedAt = DateTime.Now,
|
||||
});
|
||||
}
|
||||
}
|
||||
// }
|
||||
// }
|
||||
await _context.SaveChangesAsync();
|
||||
|
||||
return Success();
|
||||
|
|
@ -532,8 +597,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
var items = await _context.RetirementDeceasedNotis.AsQueryable()
|
||||
.Include(x => x.ReceiveUser)
|
||||
.Include(x => x.RetirementDeceased)
|
||||
.ThenInclude(x => x.Profile)
|
||||
.ThenInclude(x => x.Prefix)
|
||||
// .ThenInclude(x => x.Profile)
|
||||
// .ThenInclude(x => x.Prefix)
|
||||
.Where(x => x.RetirementDeceased.Id == id)
|
||||
.ToListAsync();
|
||||
|
||||
|
|
@ -562,14 +627,14 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
var payload_str = JsonConvert.SerializeObject(payload);
|
||||
foreach (var item in items)
|
||||
{
|
||||
var prefix = item.RetirementDeceased.Profile.Prefix == null ? "" : item.RetirementDeceased.Profile.Prefix.Name;
|
||||
var prefix = item.RetirementDeceased.prefix;
|
||||
var profile = req.Persons.FirstOrDefault(x => x.ProfileId == item.ReceiveUser.Id);
|
||||
if (profile != null)
|
||||
{
|
||||
await _repositoryNoti.PushNotificationAsync(
|
||||
item.ReceiveUser.Id,
|
||||
$"หนังสือเวียนถึงแก่กรรมของ {prefix}{item.RetirementDeceased.Profile.FirstName} {item.RetirementDeceased.Profile.LastName}",
|
||||
$"แจ้งข่าวการถึงแก่กรรมของ {prefix}{item.RetirementDeceased.Profile.FirstName} {item.RetirementDeceased.Profile.LastName}",
|
||||
$"หนังสือเวียนถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
|
||||
$"แจ้งข่าวการถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
|
||||
payload_str,
|
||||
profile.IsSendInbox,
|
||||
profile.IsSendMail
|
||||
|
|
@ -582,8 +647,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
{
|
||||
await _repositoryNoti.PushNotificationAsync(
|
||||
item.ReceiveUser.Id,
|
||||
$"หนังสือเวียนถึงแก่กรรมของ {prefix}{item.RetirementDeceased.Profile.FirstName} {item.RetirementDeceased.Profile.LastName}",
|
||||
$"แจ้งข่าวการถึงแก่กรรมของ {prefix}{item.RetirementDeceased.Profile.FirstName} {item.RetirementDeceased.Profile.LastName}",
|
||||
$"หนังสือเวียนถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
|
||||
$"แจ้งข่าวการถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
|
||||
payload_str,
|
||||
item.IsSendInbox,
|
||||
item.IsSendMail
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue