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

แก้ไขรายงานประกาศเกษียณ, เพิ่มtemplateลูกจ้างประจำ, ตัดคำนำหน้ารายงานทดลองงาน

Browse source
This commit is contained in:
Harid Promsri (Bright) 2023-09-16 11:54:34 +07:00
parent 679cc2cfc2
commit 097888244d
12 changed files with 45 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
View file

@ -107,14 +107,22 @@ namespace BMA.EHR.Application.Repositories.Reports
var results = responseTask.Result;
var json = results.Content.ReadAsStringAsync().Result;
List<ProfileJsonRequest> profiles = JsonConvert.DeserializeObject<List<ProfileJsonRequest>>(json);
profiles = profiles.OrderBy(x => x.order).ToList();
if (retireHistorys.TypeReport != null)
{
retireHistorys.Total = profiles.Where(x => x.remove == retireHistorys.TypeReport).Count();
profiles = profiles.Where(x => x.remove == retireHistorys.TypeReport).OrderBy(x => x.order).ToList();
}
else
{
profiles = profiles.OrderBy(x => x.order).ToList();
}
return new { retireHistorys.Detail, retireHistorys.Id, retireHistorys.CreatedAt, Year = retireHistorys.Year.ToThaiYear().ToString().ToThaiNumber(), retireHistorys.Round, retireHistorys.Type, retireHistorys.TypeReport, Total = retireHistorys.Total.ToString().ToThaiNumber(), profile = profiles};
}
}
else
{
var profile_retire = await _dbContext.Set<RetirementProfile>()
.Where(x => x.RetirementPeriod == retire)
.Where(x => x.RetirementPeriod == retire && (retire.TypeReport == null || retire.TypeReport == x.Remove))
.OrderBy(x => x.Order)
.Select(x => new
{