api จัดการคำขอเครื่องราช
This commit is contained in:
parent
4215af4a0b
commit
f386a5fea6
8 changed files with 409 additions and 233 deletions
|
|
@ -4932,7 +4932,7 @@ namespace BMA.EHR.Application.Repositories
|
|||
// }
|
||||
|
||||
// Get Data Table insignai_has_profile
|
||||
public async Task<List<InsigniaRequestItem?>> InsigniaHasProfile(Guid period, Guid ocId)
|
||||
public async Task<List<InsigniaRequestItem>> InsigniaHasProfile(Guid period, Guid ocId, string status)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
|
@ -4960,6 +4960,7 @@ namespace BMA.EHR.Application.Repositories
|
|||
.Include(x => x.Profile)
|
||||
.ThenInclude(x => x.Insignias)
|
||||
.ThenInclude(x => x.Insignia)
|
||||
.Where(h => status.Trim().ToUpper() == "ALL" ? h.Status != null : h.Status == status.Trim().ToUpper())
|
||||
.Where(h => h.Request.Id == id)
|
||||
.ToList()
|
||||
.Select(h => new InsigniaRequestItem
|
||||
|
|
@ -4976,6 +4977,7 @@ namespace BMA.EHR.Application.Repositories
|
|||
Level = h.RequestInsignia.InsigniaType.Name,
|
||||
IsApprove = h.IsApprove,
|
||||
RequestDate = h.RequestDate,
|
||||
Status = h.Status,
|
||||
RequestNote = "",
|
||||
// Docs = GetDocFile(h.Profile.Id),
|
||||
MatchingConditions = h.MatchingConditions == null ? null : JsonConvert.DeserializeObject<List<MatchingCondition>>(h.MatchingConditions)
|
||||
|
|
@ -5119,6 +5121,7 @@ namespace BMA.EHR.Application.Repositories
|
|||
{
|
||||
req.RequestProfiles.Add(new InsigniaRequestProfile
|
||||
{
|
||||
Status = "PENDING",
|
||||
Profile = pf,
|
||||
RequestInsignia = req_insignia,
|
||||
Salary = item.Salary == null ? null : item.Salary,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue