ปรับ api ให้สามารถ upload เอกสารประกอบได้หลายไฟล์
This commit is contained in:
parent
1f7b5cd21f
commit
0f5c9a2dcf
10 changed files with 1356 additions and 23 deletions
|
|
@ -13,6 +13,7 @@ using Swashbuckle.AspNetCore.Annotations;
|
|||
using System.Security.Claims;
|
||||
using BMA.EHR.Application.Repositories.Commands;
|
||||
using BMA.EHR.Application.Repositories.Leaves.TimeAttendants;
|
||||
using Org.BouncyCastle.Ocsp;
|
||||
|
||||
namespace BMA.EHR.Leave.Service.Controllers
|
||||
{
|
||||
|
|
@ -167,10 +168,13 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
// upload document
|
||||
if (req.LeaveDocument != null)
|
||||
{
|
||||
var doc = await _minIOService.UploadFileAsync(req.LeaveDocument);
|
||||
if (doc != null)
|
||||
foreach (var d in req.LeaveDocument)
|
||||
{
|
||||
leaveRequest.LeaveDocument = doc;
|
||||
var doc = await _minIOService.UploadFileAsync(d);
|
||||
if (doc != null)
|
||||
{
|
||||
leaveRequest.LeaveDocument.Add(new LeaveDocument { Document = doc });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -381,10 +385,13 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
// upload document
|
||||
if (req.LeaveDocument != null)
|
||||
{
|
||||
var doc = await _minIOService.UploadFileAsync(req.LeaveDocument);
|
||||
if (doc != null)
|
||||
foreach (var d in req.LeaveDocument)
|
||||
{
|
||||
leaveRequest.LeaveDocument = doc;
|
||||
var doc = await _minIOService.UploadFileAsync(d);
|
||||
if (doc != null)
|
||||
{
|
||||
leaveRequest.LeaveDocument.Add(new LeaveDocument { Document = doc });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -795,7 +802,8 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
LeaveAddress = rawData.LeaveAddress,
|
||||
LeaveNumber = rawData.LeaveNumber,
|
||||
LeaveDetail = rawData.LeaveDetail,
|
||||
LeaveDocument = rawData.LeaveDocument == null ? "" : await _minIOService.ImagesPath(rawData.LeaveDocument.Id),
|
||||
LeaveDocument = new(),
|
||||
//LeaveDocument = rawData.LeaveDocument == null ? null : await _minIOService.ImagesPath(rawData.LeaveDocument.Id),
|
||||
LeaveDraftDocument = rawData.LeaveDraftDocument == null ? "" : await _minIOService.ImagesPath(rawData.LeaveDraftDocument.Id),
|
||||
|
||||
LeaveLastStart = lastLeaveRequest == null ? null : lastLeaveRequest.LeaveStartDate,
|
||||
|
|
@ -855,6 +863,17 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
LeaveTypeCode = rawData.LeaveTypeCode ?? ""
|
||||
};
|
||||
|
||||
|
||||
if (rawData.LeaveDocument != null && rawData.LeaveDocument.Count > 0)
|
||||
{
|
||||
foreach (var d in rawData.LeaveDocument)
|
||||
{
|
||||
var file = await _minIOService.ImagesPath(d.Document.Id);
|
||||
result.LeaveDocument.Add(file);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return Success(result);
|
||||
}
|
||||
|
||||
|
|
@ -1267,7 +1286,8 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
LeaveAddress = rawData.LeaveAddress,
|
||||
LeaveNumber = rawData.LeaveNumber,
|
||||
LeaveDetail = rawData.LeaveDetail,
|
||||
LeaveDocument = rawData.LeaveDocument == null ? "" : await _minIOService.ImagesPath(rawData.LeaveDocument.Id),
|
||||
LeaveDocument = new(),
|
||||
//LeaveDocument = rawData.LeaveDocument == null ? "" : await _minIOService.ImagesPath(rawData.LeaveDocument.Id),
|
||||
LeaveDraftDocument = rawData.LeaveDraftDocument == null ? "" : await _minIOService.ImagesPath(rawData.LeaveDraftDocument.Id),
|
||||
|
||||
LeaveLastStart = lastLeaveRequest == null ? null : lastLeaveRequest.LeaveStartDate,
|
||||
|
|
@ -1339,6 +1359,15 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
LeaveRemain = rawData.Type.Limit - leaveSummary
|
||||
};
|
||||
|
||||
if (rawData.LeaveDocument != null && rawData.LeaveDocument.Count > 0)
|
||||
{
|
||||
foreach (var d in rawData.LeaveDocument)
|
||||
{
|
||||
var file = await _minIOService.ImagesPath(d.Document.Id);
|
||||
result.LeaveDocument.Add(file);
|
||||
}
|
||||
}
|
||||
|
||||
return Success(result);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue