This commit is contained in:
parent
a8dc4b82db
commit
78bbfb7107
1 changed files with 2 additions and 38 deletions
|
|
@ -511,9 +511,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
data.IsNoBurden,
|
data.IsNoBurden,
|
||||||
data.IsDiscipline,
|
data.IsDiscipline,
|
||||||
data.CancelReason,
|
data.CancelReason,
|
||||||
idCancel = data.RetirementResignCancels?.Id ?? Guid.Empty,
|
idCancel = data.RetirementResignCancels?.Id ?? null,
|
||||||
statusCancel = data.RetirementResignCancels?.Status ?? null,
|
statusCancel = data.RetirementResignCancels?.Status ?? null,
|
||||||
statusMain = data.Status,
|
statusMain = data.Status == "CANCEL" ? "DONECANCEL" : data.Status,
|
||||||
// Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar),
|
// Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar),
|
||||||
Docs = retirementResignDocs,
|
Docs = retirementResignDocs,
|
||||||
// DocDebts = retirementResignDebtDocs,
|
// DocDebts = retirementResignDebtDocs,
|
||||||
|
|
@ -1261,43 +1261,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
}
|
}
|
||||||
updated.IsCancel = true;
|
updated.IsCancel = true;
|
||||||
}
|
}
|
||||||
// else
|
|
||||||
// {
|
|
||||||
updated.Status = "CANCEL";
|
updated.Status = "CANCEL";
|
||||||
// }
|
|
||||||
// if (updated.OfficerReject != null)
|
|
||||||
// {
|
|
||||||
// await _repositoryNoti.PushNotificationAsync(
|
|
||||||
// Guid.Parse("08dc3db9-257d-470d-8256-3dc24f6fa332"),
|
|
||||||
// $"คำขอลาออกของ {updated.prefix}{updated.firstName} {updated.lastName} ได้ทำการขอยกเลิก",
|
|
||||||
// $"คำขอลาออกของ {updated.prefix}{updated.firstName} {updated.lastName} ได้ทำการขอยกเลิก",
|
|
||||||
// "",
|
|
||||||
// "",
|
|
||||||
// true
|
|
||||||
// );
|
|
||||||
// }
|
|
||||||
// if (updated.CommanderReject != null)
|
|
||||||
// {
|
|
||||||
// await _repositoryNoti.PushNotificationAsync(
|
|
||||||
// Guid.Parse("08dc432c-2bc5-4b81-8089-9c057c51192c"),
|
|
||||||
// $"คำขอลาออกของ {updated.prefix}{updated.firstName} {updated.lastName} ได้ทำการขอยกเลิก",
|
|
||||||
// $"คำขอลาออกของ {updated.prefix}{updated.firstName} {updated.lastName} ได้ทำการขอยกเลิก",
|
|
||||||
// "",
|
|
||||||
// "",
|
|
||||||
// true
|
|
||||||
// );
|
|
||||||
// }
|
|
||||||
// if (updated.OligarchReject != null)
|
|
||||||
// {
|
|
||||||
// await _repositoryNoti.PushNotificationAsync(
|
|
||||||
// Guid.Parse("08dc4307-0adc-4bcd-8213-5479bb010236"),
|
|
||||||
// $"คำขอลาออกของ {updated.prefix}{updated.firstName} {updated.lastName} ได้ทำการขอยกเลิก",
|
|
||||||
// $"คำขอลาออกของ {updated.prefix}{updated.firstName} {updated.lastName} ได้ทำการขอยกเลิก",
|
|
||||||
// "",
|
|
||||||
// "",
|
|
||||||
// true
|
|
||||||
// );
|
|
||||||
// }
|
|
||||||
updated.LastUpdateFullName = FullName ?? "System Administrator";
|
updated.LastUpdateFullName = FullName ?? "System Administrator";
|
||||||
updated.LastUpdateUserId = UserId ?? "";
|
updated.LastUpdateUserId = UserId ?? "";
|
||||||
updated.LastUpdatedAt = DateTime.Now;
|
updated.LastUpdatedAt = DateTime.Now;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue