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-24 18:52:49 +07:00
parent 97b85a34e7
commit 5065ad3269
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@ namespace BMA.EHR.Application.Requests
public class InsigniaBorrowRequest public class InsigniaBorrowRequest
{ {
public DateTime BorrowDate { get; set; } public DateTime BorrowDate { get; set; }
public Guid BorrowOrganizationId { get; set; } public Guid? BorrowOrganizationId { get; set; }
public Guid InsigniaNoteProfileId { get; set; } public Guid InsigniaNoteProfileId { get; set; }
} }
} }

15
BMA.EHR.Insignia.Service/Controllers/InsigniaManageController.cs
View file

@ -406,7 +406,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
} }
/// <summary> /// <summary>
/// แก้ไขยืมเครื่องราชฯ /// ยืมเครื่องราชฯ
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
/// <response code="200"></response> /// <response code="200"></response>
@ -416,11 +416,6 @@ namespace BMA.EHR.Insignia.Service.Controllers
[HttpPost("borrow")] [HttpPost("borrow")]
public async Task<ActionResult<ResponseObject>> PostBorrowInsignia([FromBody] InsigniaBorrowRequest req) public async Task<ActionResult<ResponseObject>> PostBorrowInsignia([FromBody] InsigniaBorrowRequest req)
{ {
var organization = await _context.Organizations.AsQueryable()
.Include(x => x.OrganizationOrganization)
.FirstOrDefaultAsync(x => x.Id == req.BorrowOrganizationId);
if (organization == null)
return Error(GlobalMessages.OrganizationNotFound);
var insigniaNoteProfile = await _context.InsigniaNoteProfiles.AsQueryable() var insigniaNoteProfile = await _context.InsigniaNoteProfiles.AsQueryable()
.Include(x => x.RequestInsignia) .Include(x => x.RequestInsignia)
@ -431,6 +426,12 @@ namespace BMA.EHR.Insignia.Service.Controllers
if (insigniaNoteProfile.Status != "DONE") if (insigniaNoteProfile.Status != "DONE")
return Error(GlobalMessages.InsigniaNoBorrow); return Error(GlobalMessages.InsigniaNoBorrow);
var organization = await _context.Organizations.AsQueryable()
.Include(x => x.OrganizationOrganization)
.FirstOrDefaultAsync(x => x.Id == insigniaNoteProfile.Profile.OcId);
if (organization == null)
return Error(GlobalMessages.OrganizationNotFound);
var insigniaManage = await _context.InsigniaManages.AsQueryable() var insigniaManage = await _context.InsigniaManages.AsQueryable()
.FirstOrDefaultAsync(x => x.Year == insigniaNoteProfile.InsigniaNote.Year && x.Insignia == insigniaNoteProfile.RequestInsignia); .FirstOrDefaultAsync(x => x.Year == insigniaNoteProfile.InsigniaNote.Year && x.Insignia == insigniaNoteProfile.RequestInsignia);
if (insigniaManage == null) if (insigniaManage == null)
@ -472,7 +473,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
} }
/// <summary> /// <summary>
/// แก้ไขคืนเครื่องราชฯ /// คืนเครื่องราชฯ
/// </summary> /// </summary>
/// <param name="insigniaManageProfileId">Id ยืมเครื่องราช</param> /// <param name="insigniaManageProfileId">Id ยืมเครื่องราช</param>
/// <returns></returns> /// <returns></returns>