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

แก้คิวรี่ เครื่องราช ขร 4

Browse source
This commit is contained in:
Kittapath 2023-09-21 10:39:24 +07:00
parent c0018707c7
commit 56e4a63432
2 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

42
BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs
View file

@ -642,15 +642,15 @@ namespace BMA.EHR.Application.Repositories.Reports
InsigniaInitial = r.RequestInsignia.ShortName, InsigniaInitial = r.RequestInsignia.ShortName,
InsigniaName = r.RequestInsignia.Name, InsigniaName = r.RequestInsignia.Name,
ProfileId = r.Profile.Id, ProfileId = r.Profile.Id,
CitizenId = r.Profile.CitizenId, CitizenId = r.Profile.CitizenId == null ? null : r.Profile.CitizenId.ToThaiNumber(),
FullName = $"{r.Profile.Prefix?.Name}{r.Profile.FirstName} {r.Profile.LastName}", FullName = $"{r.Profile.Prefix?.Name}{r.Profile.FirstName} {r.Profile.LastName}",
ShowProfileId = r.Profile.Id, ShowProfileId = r.Profile.Id,
Type = r.Profile.PositionType == null ? "-" : r.Profile.PositionType.Name, Type = r.Profile.PositionType == null ? "-" : r.Profile.PositionType.Name,
AcademicStanding = "", AcademicStanding = "",
Level = r.Profile.PositionLevel == null ? "-" : r.Profile.PositionLevel.Name, Level = r.Profile.PositionLevel == null ? "-" : r.Profile.PositionLevel.Name,
DateStart = r.Profile.DateStart == null ? null : r.Profile.DateStart.Value.ToThaiShortDate(), DateStart = r.Profile.DateStart == null ? null : r.Profile.DateStart.Value.ToThaiShortDate().ToThaiNumber(),
SalaryAmount = r.Profile.Salaries.Count() == 0 ? 0 : SalaryAmount = r.Profile.Salaries.Count() == 0 ? "-" :
r.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount, Convert.ToInt32(r.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount).ToNumericText().ToThaiNumber(),
InsigniaRecv = "", InsigniaRecv = "",
InsigniaRecvDate = "", InsigniaRecvDate = "",
InsigniaRequest = r.RequestInsignia.ShortName, InsigniaRequest = r.RequestInsignia.ShortName,
@ -911,23 +911,23 @@ namespace BMA.EHR.Application.Repositories.Reports
.ToListAsync(); .ToListAsync();
foreach (var insigniaPeriod in insigniaPeriods) foreach (var insigniaPeriod in insigniaPeriods)
{ {
if (insigniaPeriod.EndDate.AddDays(-insigniaPeriod.Amount).Date == DateTime.Now.Date) // if (insigniaPeriod.EndDate.AddDays(-insigniaPeriod.Amount).Date == DateTime.Now.Date)
{ // {
await _repositoryNoti.PushNotificationAsync( await _repositoryNoti.PushNotificationAsync(
Guid.Parse("08db721d-ade4-480e-8d84-0853946a0ea5"), Guid.Parse("08db721d-ade4-480e-8d84-0853946a0ea5"),
$"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}", $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round} {insigniaPeriod.EndDate.AddDays(-insigniaPeriod.Amount).Date}",
$"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}", $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round} {DateTime.Now.Date}",
"", "",
true true
); );
await _repositoryNoti.PushNotificationAsync( await _repositoryNoti.PushNotificationAsync(
Guid.Parse("08db721d-adff-47b0-8762-41cd5c991001"), Guid.Parse("08db721d-adff-47b0-8762-41cd5c991001"),
$"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}", $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}",
$"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}", $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}",
"", "",
true true
); );
} // }
} }
} }

6
BMA.EHR.Retirement.Service/Controllers/RetirementController.cs
View file

@ -640,9 +640,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
} }
var num = 1; var num = 1;
var old_retire = retire.RetirementProfiles.OrderByDescending(x => x.Order).FirstOrDefault(); // var old_retire = retire.RetirementProfiles.OrderByDescending(x => x.Order).FirstOrDefault();
if (old_retire != null) // if (old_retire != null)
num = old_retire.Order + 1; // num = old_retire.Order + 1;
var data = new RetirementProfile var data = new RetirementProfile
{ {