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-09-26 17:51:18 +07:00
parent 59f782e8cf
commit 1619a502d4
22 changed files with 33518 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,10 +18,14 @@ namespace BMA.EHR.Application.Repositories
{
private readonly IApplicationDBContext _dbContext;
private readonly IHttpContextAccessor _httpContextAccessor;
public InsigniaPeriodsRepository(IApplicationDBContext dbContext, IHttpContextAccessor httpContextAccessor) : base(dbContext, httpContextAccessor)
private readonly MinIOService _documentService;
public InsigniaPeriodsRepository(IApplicationDBContext dbContext,
MinIOService documentService,
IHttpContextAccessor httpContextAccessor) : base(dbContext, httpContextAccessor)
{
_dbContext = dbContext;
_httpContextAccessor = httpContextAccessor;
_documentService = documentService;
}
public async Task<IEnumerable<InsigniaPeriod>> FindByNameAsync(string name)
@ -5706,6 +5710,7 @@ namespace BMA.EHR.Application.Repositories
else
{
var request = await _dbContext.Set<InsigniaRequest>()
.Include(x => x.Document)
.Include(x => x.Organization)
.ThenInclude(x => x.OrganizationOrganization)
.Where(x => x.Organization != null)
@ -5721,7 +5726,8 @@ namespace BMA.EHR.Application.Repositories
RequestId = request == null ? null : request.Id,
RequestNote = request == null ? "" : request.RequestNote,
RequestStatus = request == null ? null : request.RequestStatus,
OrganizationName = request == null ? "" : request.Organization.OrganizationOrganization.Name
OrganizationName = request == null ? "" : request.Organization.OrganizationOrganization.Name,
Document = request == null ? null : (request.Document == null ? null : await _documentService.ImagesPath(request.Document.Id)),
};
}
@ -5850,7 +5856,8 @@ namespace BMA.EHR.Application.Repositories
IsApprove = h.IsApprove,
RequestDate = h.RequestDate,
Status = h.Status,
RequestNote = h.Reason,
RequestNote = h.ReasonReject,
Reason = h.Reason,
// Docs = GetDocFile(h.Profile.Id),
MatchingConditions = h.MatchingConditions == null ? null : JsonConvert.DeserializeObject<List<MatchingCondition>>(h.MatchingConditions)
})).ToList();