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

Merge branch 'develop' into work

Browse source
This commit is contained in:
Kittapath 2023-09-27 13:20:28 +07:00
commit 70e59fb04c
5 changed files with 100 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

51
BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
View file

@ -718,6 +718,51 @@ namespace BMA.EHR.Application.Repositories.Commands
}
}
public async Task<List<CommandType16Response>> GetCommandType16Async(Guid id)
{
try
{
var raw_data = await _dbContext.Set<CommandReceiver>()
.Include(c => c.Command)
.Where(c => c.Command.Id == id)
.ToListAsync();
if (raw_data == null)
{
throw new Exception(GlobalMessages.CommandNotFound);
}
var report_data = (from r in raw_data
join p in _dbContext.Set<PlacementRepatriation>()
.Include(p => p.Profile)
.ThenInclude(p => p.Position)
.Include(p => p.Profile)
.ThenInclude(p => p.Salaries)
on r.RefPlacementProfileId equals p.Id
orderby r.Sequence
select new CommandType16Response
{
CommandNo = r.Command.CommandNo.ToThaiNumber(),
CommandYear = r.Command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(),
CommandAffectDate = r.Command.CommandAffectDate == null ? "" : r.Command.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
IssuerOrganizationName = r.Command.IssuerOrganizationName,
AuthorizedUserFullName = r.Command.AuthorizedUserFullName,
AuthorizedPosition = r.Command.AuthorizedPosition,
GovAidCommandNo = r.Command.GovAidCommandNo.ToThaiNumber(),
GovAidCommandDate = r.Command.GovAidCommandDate == null ? "" :
r.Command.GovAidCommandDate.Value.ToThaiFullDate3().ToThaiNumber(),
StartDate = "", // TODO: Frontend ไม่มีการเก็บค่าไว้ หรือไม่มีเก็บไว้จากระบบบรรจุ ทำให้ดึงมาแสดงไม่ได้
ActiveDate = p.Date == null ? "" : p.Date.Value.ToThaiFullDate3().ToThaiNumber()
})
.ToList();
return report_data;
}
catch
{
throw;
}
}
public async Task<List<CommandType17Response>> GetCommandType17AttachmentAsync(Guid id)
{
try
@ -800,7 +845,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PositionLevel = p.PositionLevelOld,
PositionType = p.PositionTypeOld,
PositionNumber = p.PositionNumberOld.ToThaiNumber(),
Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
//Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
Fault = r.Command.Fault.ToThaiNumber(),
GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(),
@ -854,7 +899,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PositionLevel = p.PositionLevelOld,
PositionType = p.PositionTypeOld,
PositionNumber = p.PositionNumberOld.ToThaiNumber(),
Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
//Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
Fault = r.Command.Fault.ToThaiNumber(),
GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(),
@ -907,7 +952,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PositionLevel = p.PositionLevelOld,
PositionType = p.PositionTypeOld,
PositionNumber = p.PositionNumberOld.ToThaiNumber(),
Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
//Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
Fault = r.Command.Fault.ToThaiNumber(),
GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(),