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

แก้ model

Browse source
This commit is contained in:
DESKTOP-2S5P7D1\Windows 10 2023-09-05 11:38:43 +07:00
parent d8031bff98
commit a31b72316e
8 changed files with 48 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Controllers/ProfileReportController.cs
View file

@ -519,10 +519,10 @@ namespace BMA.EHR.Report.Service.Controllers
OcFullPath = _profileService.GetOrganizationNameFullPath(p.OcId.Value, false, false),
}).FirstOrDefault();
var salary = (from s in _context.ProfileSalaries
var salary = (from s in _context.ProfileSalaries.Include(x => x.PositionLevel)
join pos in _context.PositionPaths on s.PositionId equals pos.Id
join pos_no in _context.PositionNumbers on s.PosNoId equals pos_no.Id
join pos_lv in _context.PositionLevels on s.PositionLevelId equals pos_lv.Id
// join pos_lv in _context.PositionLevels on s.PositionLevelId equals pos_lv.Id
join pos_type in _context.PositionTypes on s.PositionTypeId equals pos_type.Id
where s.Profile.Id == id
orderby s.Date.Value
@ -531,11 +531,11 @@ namespace BMA.EHR.Report.Service.Controllers
SalaryDate = s.Date == null ? "" : s.Date == new DateTime(1, 1, 1) ? "" : s.Date.Value.ToThaiShortDate(),
Position = s.SalaryClass,
PosNo = pos_no.Name,
Rank = pos_lv.Name,
Rank = s.PositionLevel == null ? null : s.PositionLevel.Name,
Salary = s.Amount == null ? "" : s.Amount.ToString().ToInteger().ToNumericText(),
RefAll = s.SalaryRef,
PositionType = pos_type.Name,
PositionLevel = pos_lv.Name,
PositionLevel = s.PositionLevel == null ? null : s.PositionLevel.Name,
PositionAmount = s.PositionSalaryAmount == null ? "" : s.PositionSalaryAmount.Value.ToString().ToInteger().ToNumericText(),
FullName = profile2.FullName,
OcFullPath = profile2.OcFullPath
@ -899,10 +899,10 @@ namespace BMA.EHR.Report.Service.Controllers
OcFullPath = _profileService.GetOrganizationNameFullPath(p.OcId.Value, false, false),
}).FirstOrDefault();
var salary = (from s in _context.ProfileSalaries
var salary = (from s in _context.ProfileSalaries.Include(x => x.PositionLevel)
join pos in _context.PositionPaths on s.PositionId equals pos.Id
join pos_no in _context.PositionNumbers on s.PosNoId equals pos_no.Id
join pos_lv in _context.PositionLevels on s.PositionLevelId equals pos_lv.Id
// join pos_lv in _context.PositionLevels on s.PositionLevelId equals pos_lv.Id
join pos_type in _context.PositionTypes on s.PositionTypeId equals pos_type.Id
where s.Profile.Id == id
orderby s.Date.Value
@ -911,11 +911,11 @@ namespace BMA.EHR.Report.Service.Controllers
SalaryDate = s.Date == null ? "" : s.Date == new DateTime(1, 1, 1) ? "" : s.Date.Value.ToThaiShortDate(),
Position = s.SalaryClass,
PosNo = pos_no.Name,
Rank = pos_lv.Name,
Rank = s.PositionLevel == null ? null : s.PositionLevel.Name,
Salary = s.Amount == null ? "" : s.Amount.ToString().ToInteger().ToNumericText(),
RefAll = s.SalaryRef,
PositionType = pos_type.Name,
PositionLevel = pos_lv.Name,
PositionLevel = s.PositionLevel == null ? null : s.PositionLevel.Name,
PositionAmount = s.PositionSalaryAmount == null ? "" : s.PositionSalaryAmount.Value.ToString().ToInteger().ToNumericText(),
FullName = profile2.FullName,
OcFullPath = profile2.OcFullPath