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

ปรับการแสดงเงินเดือนใน เอกสารแนบท้าย ให้ดึงมาจากตาราง CmdReceiver

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-09-25 11:18:55 +07:00
parent fe38ef6c1d
commit 73acb91c23
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -438,7 +438,7 @@ namespace BMA.EHR.Application.Repositories.Commands
NewPositionLevel = p.PositionLevel == null ? "" : p.PositionLevel.Name, NewPositionLevel = p.PositionLevel == null ? "" : p.PositionLevel.Name,
NewPositionType = p.PositionType == null ? "" : p.PositionType.Name, NewPositionType = p.PositionType == null ? "" : p.PositionType.Name,
NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name.ToThaiNumber(), NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name.ToThaiNumber(),
NewSalary = p.Amount == null ? "" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), NewSalary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber() AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber()
}) })
.ToList(); .ToList();
@ -618,7 +618,8 @@ namespace BMA.EHR.Application.Repositories.Commands
PositionLevel = pf.PositionLevel == null ? "" : pf.PositionLevel.Name, PositionLevel = pf.PositionLevel == null ? "" : pf.PositionLevel.Name,
PositionType = pf.PositionType == null ? "" : pf.PositionType.Name, PositionType = pf.PositionType == null ? "" : pf.PositionType.Name,
PositionNumber = pf.PosNo == null ? "" : pf.PosNo.Name.ToThaiNumber(), PositionNumber = pf.PosNo == null ? "" : pf.PosNo.Name.ToThaiNumber(),
Salary = pf.Salaries == null || pf.Salaries.Count == 0 ? "" : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
//Salary = pf.Salaries == null || pf.Salaries.Count == 0 ? "" : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
ActiveDate = "", ActiveDate = "",
ReceiveOrganizationName = r.Command!.ReceiveOrganizationName ReceiveOrganizationName = r.Command!.ReceiveOrganizationName
}) })
@ -748,7 +749,8 @@ namespace BMA.EHR.Application.Repositories.Commands
PositionType = p.PositionTypeOld, PositionType = p.PositionTypeOld,
PositionNumber = p.PositionNumberOld.ToThaiNumber(), PositionNumber = p.PositionNumberOld.ToThaiNumber(),
ActiveDate = p.ActiveDate == null ? "" : p.ActiveDate.Value.ToThaiShortDate2().ToThaiNumber(), ActiveDate = p.ActiveDate == null ? "" : p.ActiveDate.Value.ToThaiShortDate2().ToThaiNumber(),
Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), Salary = r.Amount == null ? "" : r.Amount.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(),
Remark = p.Reason ?? "" Remark = p.Reason ?? ""
}) })
.ToList(); .ToList();
@ -797,7 +799,8 @@ namespace BMA.EHR.Application.Repositories.Commands
PositionLevel = p.PositionLevelOld, PositionLevel = p.PositionLevelOld,
PositionType = p.PositionTypeOld, PositionType = p.PositionTypeOld,
PositionNumber = p.PositionNumberOld.ToThaiNumber(), PositionNumber = p.PositionNumberOld.ToThaiNumber(),
Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), Salary = r.Amount == null ? "" : r.Amount.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, Fault = r.Command.Fault,
GuiltyBasis = r.Command.GuiltyBasis, GuiltyBasis = r.Command.GuiltyBasis,
ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(), ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(),
@ -850,7 +853,8 @@ namespace BMA.EHR.Application.Repositories.Commands
PositionLevel = p.PositionLevelOld, PositionLevel = p.PositionLevelOld,
PositionType = p.PositionTypeOld, PositionType = p.PositionTypeOld,
PositionNumber = p.PositionNumberOld.ToThaiNumber(), PositionNumber = p.PositionNumberOld.ToThaiNumber(),
Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), Salary = r.Amount == null ? "" : r.Amount.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, Fault = r.Command.Fault,
GuiltyBasis = r.Command.GuiltyBasis, GuiltyBasis = r.Command.GuiltyBasis,
ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(), ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(),
@ -902,7 +906,8 @@ namespace BMA.EHR.Application.Repositories.Commands
PositionLevel = p.PositionLevelOld, PositionLevel = p.PositionLevelOld,
PositionType = p.PositionTypeOld, PositionType = p.PositionTypeOld,
PositionNumber = p.PositionNumberOld.ToThaiNumber(), PositionNumber = p.PositionNumberOld.ToThaiNumber(),
Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), Salary = r.Amount == null ? "" : r.Amount.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, Fault = r.Command.Fault,
GuiltyBasis = r.Command.GuiltyBasis, GuiltyBasis = r.Command.GuiltyBasis,
ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(), ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(),