From 27ce53559c48e69aba1ab1920bf0561aefdc01ad Mon Sep 17 00:00:00 2001 From: "Harid Promsri (Bright)" Date: Fri, 29 Sep 2023 13:04:53 +0700 Subject: [PATCH 1/2] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9Atext?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ำสั่งให้ข้าราชการที่ผ่านการประเมิน รับราชการต่อไป.trdp | Bin 29018 -> 29018 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/BMA.EHR.Report.Service/Reports/11-คำสั่งให้ข้าราชการที่ผ่านการประเมิน รับราชการต่อไป.trdp b/BMA.EHR.Report.Service/Reports/11-คำสั่งให้ข้าราชการที่ผ่านการประเมิน รับราชการต่อไป.trdp index c4d3b1aad2436152ce99887d34bb866b11ef0649..666599c41693fffc569519b05ae0a86003f50c0e 100644 GIT binary patch delta 1817 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 HlM-=AixF>@ From 5ea471d8f29ac2889ad4339768a923bed322960a Mon Sep 17 00:00:00 2001 From: Kittapath Date: Fri, 29 Sep 2023 20:44:58 +0700 Subject: [PATCH 2/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20id=20noti=20i?= =?UTF-8?q?nsignia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/InsigniaRequestController.cs | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs b/BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs index ee8c6c62..f449d4d6 100644 --- a/BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs +++ b/BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs @@ -435,7 +435,7 @@ namespace BMA.EHR.Insignia.Service.Controllers Document = result.Document, Items = new List() }; - if (RoleAdmin == true && result.RequestStatus != "st5") + if (RoleAdmin == true && result.RequestStatus != "st6") return Success(resend); if (RoleInsignia2 == true && (result.RequestStatus == "st1" || result.RequestStatus == "st2")) return Success(resend); @@ -669,15 +669,19 @@ namespace BMA.EHR.Insignia.Service.Controllers { await _repository.SaveAprove(id, ocId); var requestId = await _repository.GetRequestId(id, ocId); - var requestNew = await _context.InsigniaRequests.FirstOrDefaultAsync(i => i.Id == requestId); + var requestNew = await _context.InsigniaRequests + .Include(x => x.Organization) + .ThenInclude(x => x.OrganizationOrganization) + .Include(x => x.Period) + .FirstOrDefaultAsync(i => i.Id == requestId); if (requestNew != null) { requestNew.RequestStatus = "st3"; requestNew.RequestNote = ""; await _repositoryNoti.PushNotificationAsync( Guid.Parse("08db721d-ae15-40a2-8331-3e2e6d9d9a86"), - $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นข้อมูลขอมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", - $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นข้อมูลขอมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", + $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นขอมูลข้อมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", + $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นขอมูลข้อมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", "", true ); @@ -725,22 +729,26 @@ namespace BMA.EHR.Insignia.Service.Controllers public async Task> ApproveChangeStatusToSt6(Guid id, Guid ocId) { var requestId = await _repository.GetRequestId(id, ocId); - var requestNew = await _context.InsigniaRequests.FirstOrDefaultAsync(i => i.Id == requestId); + var requestNew = await _context.InsigniaRequests + .Include(x => x.Organization) + .ThenInclude(x => x.OrganizationOrganization) + .Include(x => x.Period) + .FirstOrDefaultAsync(i => i.Id == requestId); if (requestNew != null) { requestNew.RequestStatus = "st6"; requestNew.RequestNote = ""; await _repositoryNoti.PushNotificationAsync( Guid.Parse("08db721d-ada0-4e64-89d3-7584a893d8b8"), - $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นข้อมูลขอมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", - $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นข้อมูลขอมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", + $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นขอมูลข้อมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", + $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นขอมูลข้อมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", "", true ); await _repositoryNoti.PushNotificationAsync( - Guid.Parse("08db721d-ae67-4ed1-8b3c-490f44a73e658"), - $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นข้อมูลขอมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", - $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นข้อมูลขอมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", + Guid.Parse("08db721d-ae67-4ed1-8b3c-490f44a73e65"), + $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นขอมูลข้อมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", + $"{(requestNew.Organization.OrganizationOrganization == null ? null : requestNew.Organization.OrganizationOrganization.Name)} ยื่นขอมูลข้อมูลผู้มีสิทธิ์ได้รับเครื่องราชฯ {requestNew.Period.Name}", "", true ); @@ -934,7 +942,7 @@ namespace BMA.EHR.Insignia.Service.Controllers .ToListAsync(); var allUserUser = await _context.InsigniaRequests .Where(x => x.Period == insigniaPeriod) - .Where(x => RoleAdmin == true ? x.RequestStatus == "st5" : (RoleInsignia2 == true ? (x.RequestStatus == "st3" || x.RequestStatus == "st4") : x.Id != null)) + .Where(x => RoleAdmin == true ? x.RequestStatus == "st6" : (RoleInsignia2 == true ? (x.RequestStatus != "st1" && x.RequestStatus != "st2") : x.Id != null)) .Select(x => x.RequestProfiles.Count(x => x.Status != "DELETE" && x.Status != "REJECT")) .SumAsync(); @@ -1155,7 +1163,7 @@ namespace BMA.EHR.Insignia.Service.Controllers } var requestOlds = await _context.InsigniaRequests .Where(p => p.Period == insigniaPeriod) - .Where(p => p.RequestStatus == "st5") + .Where(p => p.RequestStatus == "st6") .ToListAsync(); foreach (var requestOld in requestOlds) {