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

fix retire/retire report

Browse source
This commit is contained in:
Bright 2024-07-01 16:52:46 +07:00
parent 00bf1f9cc8
commit a9eabbab2e
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -120,7 +120,7 @@ namespace BMA.EHR.Application.Repositories.Reports
{
profiles = profiles.OrderBy(x => x.order).ToList();
}
string SignDate = DateTime.Parse(retireHistorys.SignDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber();
string SignDate = retireHistorys.SignDate != null ? DateTime.Parse(retireHistorys.SignDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : "-";
return new { SignDate, 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 };
}
}
@ -194,7 +194,7 @@ namespace BMA.EHR.Application.Repositories.Reports
// };
// retires.Add(data);
// }
string SignDate = DateTime.Parse(retire.SignDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber();
string SignDate = retire.SignDate != null ? DateTime.Parse(retire.SignDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : "-";
return new { SignDate, retire.Detail, retire.Id, retire.CreatedAt, Year = retire.Year.ToThaiYear().ToString().ToThaiNumber(), retire.Round, retire.Type, retire.TypeReport, Total = profile_retire.Count.ToString().ToThaiNumber(), profile = profile_retire };
}
}

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

@ -958,7 +958,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
}
else
{
var apiUrl = $"{_configuration["API"]}org/profile/profileid/position/{req.ProfileId}";
var apiUrl = $"{_configuration["API"]}org/profile-employee/profileid/position/{req.ProfileId}";
using (var client = new HttpClient())
{
var data = new RetirementProfile
@ -1012,8 +1012,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.posLevelId = org.result.posLevelId;
data.posLevelName = org.result.posLevelName;
data.posLevelRank = org.result.posLevelRank;
data.posExecutiveId = org.result.posExecutiveId;
data.posExecutiveName = org.result.posExecutiveName;
//data.posExecutiveId = org.result.posExecutiveId;
//data.posExecutiveName = org.result.posExecutiveName;
data.posNo = org.result.posNo;
_context.RetirementProfiles.Add(data);