From c87ed5c32fe10dffcd7069ed4cc77c881fd09074 Mon Sep 17 00:00:00 2001 From: kittapath Date: Thu, 31 Oct 2024 21:31:24 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99?= =?UTF-8?q?=E0=B9=88=E0=B8=87=E0=B8=AA=E0=B8=AD=E0=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Models/Placement/PlacementProfile.cs | 11 +++++++---- Services/PeriodExamService.cs | 6 ++++-- bin/Debug/net7.0/appsettings.Development.json | 3 ++- bin/Debug/net7.0/appsettings.json | 3 ++- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Models/Placement/PlacementProfile.cs b/Models/Placement/PlacementProfile.cs index 99ddcdc..b13aefa 100644 --- a/Models/Placement/PlacementProfile.cs +++ b/Models/Placement/PlacementProfile.cs @@ -21,6 +21,9 @@ namespace BMA.EHR.Domain.Models.Placement [Comment("Id ตำแหน่งที่สอบได้")] public PositionPath? PositionCandidate { get; set; } + + [Comment("ตำแหน่งที่สอบได้")] + public string? positionName { get; set; } // [Comment("Id เลขที่ตำแหน่ง")] // public OrganizationPositionEntity? OrganizationPosition { get; set; } [Comment("วันที่บรรจุ")] @@ -198,14 +201,14 @@ namespace BMA.EHR.Domain.Models.Placement // [Comment("Id ด้าน/สาขา")] // public PositionPathSide? PositionPathSide { get; set; } - [Comment("Id ประเภทตำแหน่ง")] - public Guid? PositionTypeId { get; set; } + [Comment("ประเภทตำแหน่ง")] + public string? PositionType { get; set; } // [Comment("Id สายงาน")] // public PositionLine? PositionLine { get; set; } - [Comment("Id ระดับ")] - public Guid? PositionLevelId { get; set; } + [Comment("ระดับ")] + public string? PositionLevel { get; set; } [Comment("คะแนนเต็มภาค ก")] diff --git a/Services/PeriodExamService.cs b/Services/PeriodExamService.cs index a5cf4ff..d39471d 100644 --- a/Services/PeriodExamService.cs +++ b/Services/PeriodExamService.cs @@ -2146,6 +2146,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services { Placement = placement, PositionCandidate = await _contextMetadata.PositionPaths.FirstOrDefaultAsync(x => x.Id == (candidate.PositionExam == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : candidate.PositionExam.PositionId)), + positionName = candidate.PositionExam.PositionName, Prefix = Prefix == null ? null : Prefix.Name, ProfileImg = candidate.ProfileImg, Firstname = candidate.FirstName, @@ -2194,8 +2195,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Services OccupationSalary = candidate.OccupationSalary, OccupationPosition = candidate.OccupationPosition, OccupationPositionType = candidate.OccupationPositionType, - PositionLevelId = candidate.PositionExam == null ? null : candidate.PositionExam.PositionLevelId, - PositionTypeId = Guid.Parse("1526d9d3-d8b1-43ab-81b5-a84dfbe08071"), + PositionLevel = candidate.PositionExam.PositionLevelName, + PositionType = candidate.PositionExam == null ? null : (candidate.PositionExam.HighDegree == null ? null : (candidate.PositionExam.HighDegree == true ? "วิชาการ":"ทั่วไป")), OccupationTelephone = candidate.OccupationTelephone, PointTotalA = candidate.PointTotalA == null ? null : Convert.ToDouble(candidate.PointTotalA), PointA = candidate.PointA == null ? null : Convert.ToDouble(candidate.PointA), @@ -2369,6 +2370,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services { Placement = placement, PositionCandidate = await _contextMetadata.PositionPaths.FirstOrDefaultAsync(x => x.Name == candidate.PositionName), + positionName = candidate.PositionName, Prefix = candidate.Prefix, Firstname = candidate.FirstName, Lastname = candidate.LastName, diff --git a/bin/Debug/net7.0/appsettings.Development.json b/bin/Debug/net7.0/appsettings.Development.json index 952449d..bc75f2c 100644 --- a/bin/Debug/net7.0/appsettings.Development.json +++ b/bin/Debug/net7.0/appsettings.Development.json @@ -43,5 +43,6 @@ }, "Domain": "https://bma-ehr-exam.frappet.synology.me", "Protocol": "HTTPS", - "API": "https://bma-ehr.frappet.synology.me/api/v1/" + "API": "https://bma-ehr.frappet.synology.me/api/v1", + "API_KEY": "fKRL16yyEgbyTEJdsMw2h64tGSCmkW685PRtM3CygzX1JOSdptT9UJtpgWwKM8FybRTJups3GTFwj27ZRvlPdIkv3XgCoVJaD5LmR06ozuEPvCCRSdp2WFthg08V5xHc56fTPfZLpr1VmXrhd6dvYhHIqKkQUJR02Rlkss11cLRWEQOssEFVA4xdu2J5DIRO1EM5m7wRRvEwcDB4mYRXD9HH52SMq6iYqUWEWsMwLdbk7QW9yYESUEuzMW5gWrb6vIeWZxJV5bTz1PcWUyR7eO9Fyw1F5DiQYc9JgzTC1mW7cv31fEtTtrfbJYKIb5EbWilqIEUKC6A0UKBDDek35ML0006cqRVm0pvdOH6jeq7VQyYrhdXe59dBEyhYGUIfozoVBvW7Up4QBuOMjyPjSqJPlMBKwaseptfrblxQV1AOOivSBpf1ZcQyOZ8JktRtKUDSuXsmG0lsXwFlI3JCeSHdpVdgZWFYcJPegqfrB6KotR02t9AVkpLs1ZWrixwz" } diff --git a/bin/Debug/net7.0/appsettings.json b/bin/Debug/net7.0/appsettings.json index 813af28..2cb044e 100644 --- a/bin/Debug/net7.0/appsettings.json +++ b/bin/Debug/net7.0/appsettings.json @@ -42,5 +42,6 @@ "Port": "587" }, "Domain": "http://localhost:5173", - "API": "https://bma-ehr.frappet.synology.me/api/v1/" + "API": "https://bma-ehr.frappet.synology.me/api/v1", + "API_KEY": "fKRL16yyEgbyTEJdsMw2h64tGSCmkW685PRtM3CygzX1JOSdptT9UJtpgWwKM8FybRTJups3GTFwj27ZRvlPdIkv3XgCoVJaD5LmR06ozuEPvCCRSdp2WFthg08V5xHc56fTPfZLpr1VmXrhd6dvYhHIqKkQUJR02Rlkss11cLRWEQOssEFVA4xdu2J5DIRO1EM5m7wRRvEwcDB4mYRXD9HH52SMq6iYqUWEWsMwLdbk7QW9yYESUEuzMW5gWrb6vIeWZxJV5bTz1PcWUyR7eO9Fyw1F5DiQYc9JgzTC1mW7cv31fEtTtrfbJYKIb5EbWilqIEUKC6A0UKBDDek35ML0006cqRVm0pvdOH6jeq7VQyYrhdXe59dBEyhYGUIfozoVBvW7Up4QBuOMjyPjSqJPlMBKwaseptfrblxQV1AOOivSBpf1ZcQyOZ8JktRtKUDSuXsmG0lsXwFlI3JCeSHdpVdgZWFYcJPegqfrB6KotR02t9AVkpLs1ZWrixwz" } \ No newline at end of file