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-05-03 17:39:10 +07:00
parent 18d75f4b04
commit db712d586a
41 changed files with 125142 additions and 411 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -392,7 +392,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
IsSendInbox = true,
IsSendNotification = true,
// OrganizationName = retirementDeceased.OrganizationName,
// PositionName = retirementDeceased.PositionName,
PositionName = retirementDeceased.position,
// ReceiveUser = profile,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
@ -502,7 +502,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.IsSendNotification,
p.OrganizationName,
p.PositionName,
ProfileId = p.ReceiveUser.Id,
// ProfileId = p.ReceiveUser.Id,
})
.ToListAsync();
@ -547,7 +547,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
IsSendNotification = item.IsSendNotification,
OrganizationName = profile.OrganizationOrganization == null ? "" : profile.OrganizationOrganization,
PositionName = profile.Position == null ? null : profile.Position.Name,
ReceiveUser = profile,
// ReceiveUser = profile,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
CreatedAt = DateTime.Now,
@ -595,7 +595,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
public async Task<ActionResult<ResponseObject>> NotiDeceased([FromBody] RetirementDeceasedAddNotiPersonRequest req, Guid id)
{
var items = await _context.RetirementDeceasedNotis.AsQueryable()
.Include(x => x.ReceiveUser)
// .Include(x => x.ReceiveUser)
.Include(x => x.RetirementDeceased)
// .ThenInclude(x => x.Profile)
// .ThenInclude(x => x.Prefix)
@ -625,36 +625,36 @@ namespace BMA.EHR.Retirement.Service.Controllers
};
var payload_str = JsonConvert.SerializeObject(payload);
foreach (var item in items)
{
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.firstName} {item.RetirementDeceased.lastName}",
$"แจ้งข่าวการถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
payload_str,
profile.IsSendInbox,
profile.IsSendMail
);
item.IsSendMail = profile.IsSendMail;
item.IsSendInbox = profile.IsSendInbox;
item.IsSendNotification = profile.IsSendNotification;
}
else
{
await _repositoryNoti.PushNotificationAsync(
item.ReceiveUser.Id,
$"หนังสือเวียนถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
$"แจ้งข่าวการถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
payload_str,
item.IsSendInbox,
item.IsSendMail
);
}
}
// foreach (var item in items)
// {
// 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.firstName} {item.RetirementDeceased.lastName}",
// $"แจ้งข่าวการถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
// payload_str,
// profile.IsSendInbox,
// profile.IsSendMail
// );
// item.IsSendMail = profile.IsSendMail;
// item.IsSendInbox = profile.IsSendInbox;
// item.IsSendNotification = profile.IsSendNotification;
// }
// else
// {
// await _repositoryNoti.PushNotificationAsync(
// item.ReceiveUser.Id,
// $"หนังสือเวียนถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
// $"แจ้งข่าวการถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
// payload_str,
// item.IsSendInbox,
// item.IsSendMail
// );
// }
// }
await _context.SaveChangesAsync();
return Success();

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

@ -178,6 +178,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.PositionLevelOld,
p.PositionNumberOld,
p.OrganizationPositionOld,
p.PositionOld,
p.OrganizationOld,
p.PositionDate,
// Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id,
// RetirementOtherDocs = p.RetirementOtherDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
@ -328,6 +330,17 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOther.posTypeName = org.result.posTypeName;
retirementOther.posLevelId = org.result.posLevelId;
retirementOther.posLevelName = org.result.posLevelName;
retirementOther.PositionOld = org.result.position;
retirementOther.PositionLevelOld = org.result.posLevelName;
retirementOther.PositionTypeOld = org.result.posTypeName;
retirementOther.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
retirementOther.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "/") +
(org.result.child3 == null ? "" : org.result.child3 + "/") +
(org.result.child2 == null ? "" : org.result.child2 + "/") +
(org.result.child1 == null ? "" : org.result.child1 + "/") +
(org.result.root == null ? "" : org.result.root + "/");
retirementOther.OrganizationPositionOld = org.result.position + "-" + retirementOther.OrganizationOld;
}
await _context.RetirementOthers.AddAsync(retirementOther);
await _context.SaveChangesAsync();

13
BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
View file

@ -177,6 +177,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.PositionLevelOld,
p.PositionNumberOld,
p.OrganizationPositionOld,
p.PositionOld,
p.OrganizationOld,
// Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id,
})
.FirstOrDefaultAsync();
@ -289,6 +291,17 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOut.posTypeName = org.result.posTypeName;
retirementOut.posLevelId = org.result.posLevelId;
retirementOut.posLevelName = org.result.posLevelName;
retirementOut.PositionOld = org.result.position;
retirementOut.PositionLevelOld = org.result.posLevelName;
retirementOut.PositionTypeOld = org.result.posTypeName;
retirementOut.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
retirementOut.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "/") +
(org.result.child3 == null ? "" : org.result.child3 + "/") +
(org.result.child2 == null ? "" : org.result.child2 + "/") +
(org.result.child1 == null ? "" : org.result.child1 + "/") +
(org.result.root == null ? "" : org.result.root + "/");
retirementOut.OrganizationPositionOld = org.result.position + "-" + retirementOut.OrganizationOld;
}
await _context.RetirementOuts.AddAsync(retirementOut);
await _context.SaveChangesAsync();

6
BMA.EHR.Retirement.Service/Program.cs
View file

@ -160,9 +160,9 @@ var app = builder.Build();
var manager = new RecurringJobManager();
if (manager != null)
{
manager.AddOrUpdate("แจ้งเตือนระบบปลดออก", Job.FromExpression<RetirementRepository>(x => x.NotifyDischarge()), Cron.Daily(Int32.Parse(builder.Configuration["KeycloakCron:Hour"]), Int32.Parse(builder.Configuration["KeycloakCron:Minute"])), TimeZoneInfo.Local);
manager.AddOrUpdate("แจ้งเตือนระบบไล่ออก", Job.FromExpression<RetirementRepository>(x => x.NotifyExpulsion()), Cron.Daily(Int32.Parse(builder.Configuration["KeycloakCron:Hour"]), Int32.Parse(builder.Configuration["KeycloakCron:Minute"])), TimeZoneInfo.Local);
manager.AddOrUpdate("แจ้งเตือนระบบให้ออก", Job.FromExpression<RetirementRepository>(x => x.NotifyOut()), Cron.Daily(Int32.Parse(builder.Configuration["KeycloakCron:Hour"]), Int32.Parse(builder.Configuration["KeycloakCron:Minute"])), TimeZoneInfo.Local);
//manager.AddOrUpdate("แจ้งเตือนระบบปลดออก", Job.FromExpression<RetirementRepository>(x => x.NotifyDischarge()), Cron.Daily(Int32.Parse(builder.Configuration["KeycloakCron:Hour"]), Int32.Parse(builder.Configuration["KeycloakCron:Minute"])), TimeZoneInfo.Local);
//manager.AddOrUpdate("แจ้งเตือนระบบไล่ออก", Job.FromExpression<RetirementRepository>(x => x.NotifyExpulsion()), Cron.Daily(Int32.Parse(builder.Configuration["KeycloakCron:Hour"]), Int32.Parse(builder.Configuration["KeycloakCron:Minute"])), TimeZoneInfo.Local);
//manager.AddOrUpdate("แจ้งเตือนระบบให้ออก", Job.FromExpression<RetirementRepository>(x => x.NotifyOut()), Cron.Daily(Int32.Parse(builder.Configuration["KeycloakCron:Hour"]), Int32.Parse(builder.Configuration["KeycloakCron:Minute"])), TimeZoneInfo.Local);
}
// apply migrations

3
BMA.EHR.Retirement.Service/Requests/OrgRequest.cs
View file

@ -29,6 +29,9 @@ namespace BMA.EHR.Retirement.Service.Requests
public string? child4 { get; set; }
public string? child4Id { get; set; }
public string? child4ShortName { get; set; }
public string? node { get; set; }
public string? nodeId { get; set; }
public string? nodeShortName { get; set; }
public int? posMasterNo { get; set; }
public string? position { get; set; }
public string? posTypeId { get; set; }

4
BMA.EHR.Retirement.Service/appsettings.json
View file

@ -15,7 +15,7 @@
"ConnectionStrings": {
//"DefaultConnection": "User Id=sys;Password=P@ssw0rd;DBA Privilege=SYSDBA;Data Source=localhost:1521/ORCLCDB",
// "DefaultConnection": "server=127.0.0.1;user=root;password=P@ssw0rd;port=3308;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
"DefaultConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
"DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
},
"Jwt": {
"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
@ -33,6 +33,6 @@
"BucketName": "bma-recruit"
},
"Protocol": "HTTPS",
"API": "https://bma-ehr.frappet.synology.me/api/v1",
"API": "https://bma-ehr.frappet.synology.me/api/v1/",
"APIV2": "https://bma-ehr.frappet.synology.me/api/v2"
}