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

แก้รายละเอียดคำสั่ง

Browse source
This commit is contained in:
Kittapath 2023-10-05 10:01:16 +07:00
parent a418fd8d6b
commit 98acfa5425
4 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -573,7 +573,8 @@ namespace BMA.EHR.Application.Repositories.Commands
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
PlacementCommandIssuer = r.Command.PlacementCommandIssuer, PlacementCommandIssuer = r.Command.PlacementCommandIssuer,
PlacementCommandNo = r.Command.PlacementCommandNo.ToThaiNumber(), PlacementCommandNo = r.Command.PlacementCommandNo.ToThaiNumber(),
PlacementCommandDate = r.Command.PlacementCommandDate == null ? "" : r.Command.PlacementCommandDate.Value.ToThaiFullDate3().ToThaiNumber() PlacementCommandDate = r.Command.PlacementCommandDate == null ? "" : r.Command.PlacementCommandDate.Value.ToThaiFullDate3().ToThaiNumber(),
Subject = $"เรื่อง {r.Command.CommandSubject}",
}) })
.ToListAsync(); .ToListAsync();
if (raw_data == null) if (raw_data == null)
@ -608,7 +609,8 @@ namespace BMA.EHR.Application.Repositories.Commands
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
PlacementCommandIssuer = r.Command.PlacementCommandIssuer, PlacementCommandIssuer = r.Command.PlacementCommandIssuer,
PlacementCommandNo = r.Command.PlacementCommandNo.ToThaiNumber(), PlacementCommandNo = r.Command.PlacementCommandNo.ToThaiNumber(),
PlacementCommandDate = r.Command.PlacementCommandDate == null ? "" : r.Command.PlacementCommandDate.Value.ToThaiFullDate3().ToThaiNumber() PlacementCommandDate = r.Command.PlacementCommandDate == null ? "" : r.Command.PlacementCommandDate.Value.ToThaiFullDate3().ToThaiNumber(),
Subject = $"เรื่อง {r.Command.CommandSubject}",
}) })
.ToListAsync(); .ToListAsync();
if (raw_data == null) if (raw_data == null)
@ -898,7 +900,8 @@ namespace BMA.EHR.Application.Repositories.Commands
GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(), GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(),
ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(), ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(),
ConclusionFireDate = r.Command.ConclusionFireDate == null ? "" : r.Command.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(), ConclusionFireDate = r.Command.ConclusionFireDate == null ? "" : r.Command.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(),
ConclusionFireResolution = r.Command.ConclusionFireResolution.ToThaiNumber() ConclusionFireResolution = r.Command.ConclusionFireResolution.ToThaiNumber(),
Subject = $"เรื่อง {r.Command.CommandSubject}",
}) })
.ToList(); .ToList();
@ -952,7 +955,8 @@ namespace BMA.EHR.Application.Repositories.Commands
GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(), GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(),
ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(), ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(),
ConclusionFireDate = r.Command.ConclusionFireDate == null ? "" : r.Command.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(), ConclusionFireDate = r.Command.ConclusionFireDate == null ? "" : r.Command.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(),
ConclusionFireResolution = r.Command.ConclusionFireResolution.ToThaiNumber() ConclusionFireResolution = r.Command.ConclusionFireResolution.ToThaiNumber(),
Subject = $"เรื่อง {r.Command.CommandSubject}",
}) })
.ToList(); .ToList();

6
BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
View file

@ -6695,9 +6695,9 @@ namespace BMA.EHR.Application.Repositories.Commands
Double MonthSalaryAmount = 0; Double MonthSalaryAmount = 0;
if (profile != null && profile.Salaries.Count() > 0) if (profile != null && profile.Salaries.Count() > 0)
{ {
SalaryAmount = placementProfile.Amount == null || placementProfile.Amount == 0 ? profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value : 0; SalaryAmount = placementProfile.Amount == null || placementProfile.Amount == 0 ? (profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount != null ? profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value : 0) : 0;
PositionSalaryAmount = placementProfile.PositionSalaryAmount == null || placementProfile.PositionSalaryAmount == 0 ? profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().PositionSalaryAmount.Value : 0; PositionSalaryAmount = placementProfile.PositionSalaryAmount == null || placementProfile.PositionSalaryAmount == 0 ? (profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().PositionSalaryAmount != null ? profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().PositionSalaryAmount.Value : 0) : 0;
MonthSalaryAmount = placementProfile.MouthSalaryAmount == null || placementProfile.MouthSalaryAmount == 0 ? profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().MouthSalaryAmount.Value : 0; MonthSalaryAmount = placementProfile.MouthSalaryAmount == null || placementProfile.MouthSalaryAmount == 0 ? (profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().MouthSalaryAmount != null ? profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().MouthSalaryAmount.Value : 0) : 0;
} }
return new PlacementSalaryResponse return new PlacementSalaryResponse

1
BMA.EHR.Application/Responses/Reports/CommandType11Response.cs
View file

@ -23,5 +23,6 @@
public string PlacementCommandNo { get; set; } = string.Empty; public string PlacementCommandNo { get; set; } = string.Empty;
public string PlacementCommandDate { get; set; } = string.Empty; public string PlacementCommandDate { get; set; } = string.Empty;
public string Subject { get; set; } = string.Empty;
} }
} }

1
BMA.EHR.Application/Responses/Reports/CommandType18Response.cs
View file

@ -39,5 +39,6 @@
public string ConclusionFireDate { get; set; } = string.Empty; public string ConclusionFireDate { get; set; } = string.Empty;
public string ConclusionFireResolution { get; set; } = string.Empty; public string ConclusionFireResolution { get; set; } = string.Empty;
public string Subject { get; set; } = string.Empty;
} }
} }