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

Merge branch 'develop' into working

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-09-02 13:26:14 +07:00
commit 69bd9c0a68
25 changed files with 49062 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs
View file

@ -4612,7 +4612,7 @@ namespace BMA.EHR.Application.Repositories
var type3_level11 = await GetInsigniaCandidate_Type3_Level11(periodId, ocId);
var type4_level10 = await GetInsigniaCandidate_Type4_Level10(periodId, ocId);
var type4_level11 = await GetInsigniaCandidate_Type4_Level11(periodId, ocId);
var type_coin = await GetInsigniaCandidate(periodId, ocId);
// var type_coin = await GetInsigniaCandidate(periodId, ocId);
// union result
foreach (var r in type4_level11)
@ -4699,10 +4699,10 @@ namespace BMA.EHR.Application.Repositories
if (old == null)
result_candidate.Add(r);
}
foreach (var r in type_coin)
{
result_candidate.Add(r);
}
// foreach (var r in type_coin)
// {
// result_candidate.Add(r);
// }
return result_candidate.OrderBy(x => x.Seq).ThenBy(x => x.Gender).ThenBy(x => x.ProfileId).ToList();
}
@ -4843,6 +4843,7 @@ namespace BMA.EHR.Application.Repositories
Name = p.Name,
Round = p.Round,
Year = p.Year,
IsLock = p.IsLock,
})
.FirstOrDefaultAsync(x => x.Id == id);
@ -4862,6 +4863,8 @@ namespace BMA.EHR.Application.Repositories
Year = period.Year,
Round = period.Round,
Name = period.Name,
IsLock = period.IsLock,
RequestId = request == null ? null : request.Id,
RequestNote = request == null ? "" : request.RequestNote,
RequestStatus = request == null ? null : request.RequestStatus,
OrganizationName = request == null ? "" : request.Organization.OrganizationOrganization.Name
@ -4976,6 +4979,7 @@ namespace BMA.EHR.Application.Repositories
Id = h.Id,
CitizenId = h.Profile.CitizenId,
ProfileId = h.Profile.Id,
ProfileType = h.Profile.ProfileType,
FullName = $"{h.Profile.FirstName} {h.Profile.LastName}",
Position = h.Profile.Position.Name,
PosNo = h.Profile.PosNo.Id,

1
BMA.EHR.Application/Requests/InsigniaRequestItem.cs
View file

@ -4,6 +4,7 @@
{
public Guid Id { get; set; }
public string CitizenId { get; set; }
public string? ProfileType { get; set; }
public Guid ProfileId { get; set; }
public string FullName { get; set; }
public string Position { get; set; }

2
BMA.EHR.Application/Requests/InsigniaResults.cs
View file

@ -5,12 +5,14 @@ namespace BMA.EHR.Application.Requests
public class InsigniaResults
{
public Guid PeriodId { get; set; }
public Guid? RequestId { get; set; }
public string? Name { get; set; }
public int Year { get; set; }
public int Round { get; set; }
public string RequestNote { get; set; }
public string RequestStatus { get; set; }
public string OrganizationName { get; set; }
public bool IsLock { get; set; }
public List<InsigniaRequestItem> Items { get; set; }
}
}