no message
This commit is contained in:
Kittapath
parent
63b02dcc4c
commit
afe16503ee
17 changed files with 36169 additions and 139 deletions
|
|
@ -242,10 +242,18 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
p.CommanderApproveReason,
|
||||
p.CommanderRejectReason,
|
||||
p.CommanderRejectDate,
|
||||
p.OfficerReject,
|
||||
p.OfficerApproveReason,
|
||||
p.OfficerRejectReason,
|
||||
p.OfficerRejectDate,
|
||||
p.RemarkHorizontal,
|
||||
p.position,
|
||||
p.posTypeName,
|
||||
p.posLevelName,
|
||||
p.posMasterNo,
|
||||
// Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id,
|
||||
RetirementResignDocs = p.RetirementResignDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
|
||||
RetirementResignDebtDocs = p.RetirementResignDebtDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
|
||||
// RetirementResignDebtDocs = p.RetirementResignDebtDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
|
||||
})
|
||||
.FirstOrDefaultAsync();
|
||||
if (data == null)
|
||||
|
|
@ -262,17 +270,17 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
};
|
||||
retirementResignDocs.Add(_doc);
|
||||
}
|
||||
var retirementResignDebtDocs = new List<dynamic>();
|
||||
foreach (var doc in data.RetirementResignDebtDocs)
|
||||
{
|
||||
var _doc = new
|
||||
{
|
||||
FileName = doc.FileName,
|
||||
PathName = await _documentService.ImagesPath(doc.Id),
|
||||
doc.Id,
|
||||
};
|
||||
retirementResignDebtDocs.Add(_doc);
|
||||
}
|
||||
// var retirementResignDebtDocs = new List<dynamic>();
|
||||
// foreach (var doc in data.RetirementResignDebtDocs)
|
||||
// {
|
||||
// var _doc = new
|
||||
// {
|
||||
// FileName = doc.FileName,
|
||||
// PathName = await _documentService.ImagesPath(doc.Id),
|
||||
// doc.Id,
|
||||
// };
|
||||
// retirementResignDebtDocs.Add(_doc);
|
||||
// }
|
||||
var _data = new
|
||||
{
|
||||
data.Id,
|
||||
|
|
@ -303,10 +311,18 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
data.CommanderApproveReason,
|
||||
data.CommanderRejectReason,
|
||||
data.CommanderRejectDate,
|
||||
data.OfficerReject,
|
||||
data.OfficerApproveReason,
|
||||
data.OfficerRejectReason,
|
||||
data.OfficerRejectDate,
|
||||
data.RemarkHorizontal,
|
||||
data.position,
|
||||
data.posTypeName,
|
||||
data.posLevelName,
|
||||
data.posMasterNo,
|
||||
// Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar),
|
||||
Docs = retirementResignDocs,
|
||||
DocDebts = retirementResignDebtDocs,
|
||||
// DocDebts = retirementResignDebtDocs,
|
||||
};
|
||||
|
||||
return Success(_data);
|
||||
|
|
@ -501,32 +517,32 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
updated.LastUpdateUserId = UserId ?? "";
|
||||
updated.LastUpdatedAt = DateTime.Now;
|
||||
|
||||
if (Request.Form.Files != null && Request.Form.Files.Count != 0)
|
||||
{
|
||||
foreach (var file in Request.Form.Files)
|
||||
{
|
||||
var fileExtension = Path.GetExtension(file.FileName);
|
||||
// if (Request.Form.Files != null && Request.Form.Files.Count != 0)
|
||||
// {
|
||||
// foreach (var file in Request.Form.Files)
|
||||
// {
|
||||
// var fileExtension = Path.GetExtension(file.FileName);
|
||||
|
||||
var doc = await _documentService.UploadFileAsync(file, file.FileName);
|
||||
var _doc = await _context.Documents.AsQueryable()
|
||||
.FirstOrDefaultAsync(x => x.Id == doc.Id);
|
||||
if (_doc != null)
|
||||
{
|
||||
var retirementResignDebtDoc = new RetirementResignDebtDoc
|
||||
{
|
||||
RetirementResign = updated,
|
||||
Document = _doc,
|
||||
CreatedFullName = FullName ?? "System Administrator",
|
||||
CreatedUserId = UserId ?? "",
|
||||
CreatedAt = DateTime.Now,
|
||||
LastUpdateFullName = FullName ?? "System Administrator",
|
||||
LastUpdateUserId = UserId ?? "",
|
||||
LastUpdatedAt = DateTime.Now,
|
||||
};
|
||||
await _context.RetirementResignDebtDocs.AddAsync(retirementResignDebtDoc);
|
||||
}
|
||||
}
|
||||
}
|
||||
// var doc = await _documentService.UploadFileAsync(file, file.FileName);
|
||||
// var _doc = await _context.Documents.AsQueryable()
|
||||
// .FirstOrDefaultAsync(x => x.Id == doc.Id);
|
||||
// if (_doc != null)
|
||||
// {
|
||||
// var retirementResignDebtDoc = new RetirementResignDebtDoc
|
||||
// {
|
||||
// RetirementResign = updated,
|
||||
// Document = _doc,
|
||||
// CreatedFullName = FullName ?? "System Administrator",
|
||||
// CreatedUserId = UserId ?? "",
|
||||
// CreatedAt = DateTime.Now,
|
||||
// LastUpdateFullName = FullName ?? "System Administrator",
|
||||
// LastUpdateUserId = UserId ?? "",
|
||||
// LastUpdatedAt = DateTime.Now,
|
||||
// };
|
||||
// await _context.RetirementResignDebtDocs.AddAsync(retirementResignDebtDoc);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
await _context.SaveChangesAsync();
|
||||
return Success();
|
||||
}
|
||||
|
|
@ -661,6 +677,92 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
return Success();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// การเจ้าหน้าที่ อนุมัติคำลาออก
|
||||
/// </summary>
|
||||
/// <param name="id">Id คำลาออก</param>
|
||||
/// <returns></returns>
|
||||
/// <response code="200"></response>
|
||||
/// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
|
||||
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
|
||||
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
|
||||
[HttpPut("officer/confirm/{id:length(36)}")]
|
||||
public async Task<ActionResult<ResponseObject>> OfficerConfirm([FromBody] RetirementReasonRequest req, Guid id)
|
||||
{
|
||||
var updated = await _context.RetirementResigns
|
||||
.FirstOrDefaultAsync(x => x.Id == id);
|
||||
if (updated == null)
|
||||
return Error(GlobalMessages.RetirementResignNotFound, 404);
|
||||
|
||||
// updated.Status = "APPROVE";
|
||||
updated.OfficerReject = false;
|
||||
updated.OfficerApproveReason = req.Reason;
|
||||
updated.LastUpdateFullName = FullName ?? "System Administrator";
|
||||
updated.LastUpdateUserId = UserId ?? "";
|
||||
updated.LastUpdatedAt = DateTime.Now;
|
||||
await _repositoryNoti.PushNotificationAsync(
|
||||
Guid.Parse("08dbca3a-8b6a-4a4e-8b23-1f62e4f30ef6"),
|
||||
$"คำขอลาออกขอ {updated.prefix}{updated.firstName} {updated.lastName} ได้รับการอนุมัติจากการเจ้าหน้าที่",
|
||||
$"คำขอลาออกขอ {updated.prefix}{updated.firstName} {updated.lastName} ได้รับการอนุมัติจากการเจ้าหน้าที่",
|
||||
"",
|
||||
true
|
||||
);
|
||||
await _repositoryNoti.PushNotificationAsync(
|
||||
Guid.Parse("08dbc953-61ac-47eb-82d7-0e72df7669b5"),
|
||||
$"คำขอลาออกขอ {updated.prefix}{updated.firstName} {updated.lastName} ได้รับการอนุมัติจากการเจ้าหน้าที่",
|
||||
$"คำขอลาออกขอ {updated.prefix}{updated.firstName} {updated.lastName} ได้รับการอนุมัติจากการเจ้าหน้าที่",
|
||||
"",
|
||||
true
|
||||
);
|
||||
await _context.SaveChangesAsync();
|
||||
|
||||
return Success();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// การเจ้าหน้าที่ ไม่อนุมัติคำลาออก
|
||||
/// </summary>
|
||||
/// <param name="id">Id คำลาออก</param>
|
||||
/// <returns></returns>
|
||||
/// <response code="200"></response>
|
||||
/// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
|
||||
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
|
||||
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
|
||||
[HttpPut("officer/reject/{id:length(36)}")]
|
||||
public async Task<ActionResult<ResponseObject>> OfficerReject([FromBody] RetirementReasonDateRequest req, Guid id)
|
||||
{
|
||||
var updated = await _context.RetirementResigns
|
||||
.FirstOrDefaultAsync(x => x.Id == id);
|
||||
if (updated == null)
|
||||
return Error(GlobalMessages.RetirementResignNotFound, 404);
|
||||
if ((DateTime.Now - updated.CreatedAt).TotalDays >= 90)
|
||||
return Error("สามารถยับยั้งได้ไม่เกิน 90 วัน");
|
||||
// updated.Status = "REJECT";
|
||||
updated.OfficerReject = true;
|
||||
updated.OfficerRejectReason = req.Reason;
|
||||
updated.OfficerRejectDate = req.Date;
|
||||
updated.LastUpdateFullName = FullName ?? "System Administrator";
|
||||
updated.LastUpdateUserId = UserId ?? "";
|
||||
updated.LastUpdatedAt = DateTime.Now;
|
||||
await _repositoryNoti.PushNotificationAsync(
|
||||
Guid.Parse("08dbca3a-8b6a-4a4e-8b23-1f62e4f30ef6"),
|
||||
$"คำขอลาออกขอ {updated.prefix}{updated.firstName} {updated.lastName} ถูกยับยั้งจากการเจ้าหน้าที่",
|
||||
$"คำขอลาออกขอ {updated.prefix}{updated.firstName} {updated.lastName} ถูกยับยั้งจากการเจ้าหน้าที่",
|
||||
"",
|
||||
true
|
||||
);
|
||||
await _repositoryNoti.PushNotificationAsync(
|
||||
Guid.Parse("08dbc953-61ac-47eb-82d7-0e72df7669b5"),
|
||||
$"คำขอลาออกขอ {updated.prefix}{updated.firstName} {updated.lastName} ถูกยับยั้งจากการเจ้าหน้าที่",
|
||||
$"คำขอลาออกขอ {updated.prefix}{updated.firstName} {updated.lastName} ถูกยับยั้งจากการเจ้าหน้าที่",
|
||||
"",
|
||||
true
|
||||
);
|
||||
await _context.SaveChangesAsync();
|
||||
|
||||
return Success();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// ผู้บังคับบัญชา อนุมัติคำลาออก
|
||||
/// </summary>
|
||||
|
|
@ -930,6 +1032,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
LastUpdatedAt = p.LastUpdatedAt,
|
||||
OrganizationPositionOld = p.RetirementResign.OrganizationPositionOld,
|
||||
CreatedAt = p.CreatedAt,
|
||||
position = p.RetirementResign.position,
|
||||
posTypeName = p.RetirementResign.posTypeName,
|
||||
posLevelName = p.RetirementResign.posLevelName,
|
||||
posMasterNo = p.RetirementResign.posMasterNo,
|
||||
|
||||
Score1 = p.Score1,
|
||||
Score2 = p.Score2,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue