diff --git a/.vs/BMA.EHR.Recruit.Service/DesignTimeBuild/.dtbcache.v2 b/.vs/BMA.EHR.Recruit.Service/DesignTimeBuild/.dtbcache.v2 index b41ecde..d37fcff 100644 Binary files a/.vs/BMA.EHR.Recruit.Service/DesignTimeBuild/.dtbcache.v2 and b/.vs/BMA.EHR.Recruit.Service/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/BMA.EHR.Recruit.Service/v17/.suo b/.vs/BMA.EHR.Recruit.Service/v17/.suo index f246cc6..2099b8b 100644 Binary files a/.vs/BMA.EHR.Recruit.Service/v17/.suo and b/.vs/BMA.EHR.Recruit.Service/v17/.suo differ diff --git a/Controllers/RecruitController.cs b/Controllers/RecruitController.cs index 63ea33d..0927d11 100644 --- a/Controllers/RecruitController.cs +++ b/Controllers/RecruitController.cs @@ -1,9 +1,6 @@ using Amazon.S3.Model; using BMA.EHR.MetaData.Service.Models; using BMA.EHR.Profile.Service.Models.HR; - - -//using BMA.EHR.Extensions; using BMA.EHR.Recruit.Service.Core; using BMA.EHR.Recruit.Service.Data; using BMA.EHR.Recruit.Service.Extensions; @@ -1242,6 +1239,9 @@ namespace BMA.EHR.Recruit.Service.Controllers var file = Request.Form.Files[0]; var doc = await _minioService.UploadFileAsync(file); import_doc_id = doc.Id.ToString("D"); + + Console.WriteLine($"file id = {import_doc_id}"); + var fileContent = (await _minioService.DownloadFileAsync(doc.Id)).FileContent; // create import history @@ -1284,20 +1284,20 @@ namespace BMA.EHR.Recruit.Service.Controllers r.ExamId = workSheet?.Cells[row, 2]?.GetValue(); r.FullA = (int)workSheet?.Cells[7, 7]?.GetValue().Replace("(", "").Replace(")", "").Replace("คะแนน", "").Trim().ToInteger(); - r.SumA = workSheet?.Cells[row, 7]?.GetValue() == "ขส." ? 0 : (int)workSheet?.Cells[row, 7]?.GetValue().Replace(".00", "").ToInteger(); + r.SumA = workSheet?.Cells[row, 7]?.GetValue() == "ขส." ? 0.00 : (double)workSheet?.Cells[row, 7]?.GetValue(); r.PercentageA = workSheet?.Cells[row, 8]?.GetValue() == "ขส." ? 0.0 : (double)workSheet?.Cells[row, 8]?.GetValue(); r.AStatus = workSheet?.Cells[row, 9]?.GetValue(); r.FullB = (int)workSheet?.Cells[7, 12]?.GetValue().Replace("(", "").Replace(")", "").Replace("คะแนน", "").Trim().ToInteger(); - r.SumB = workSheet?.Cells[row, 12]?.GetValue() == "ขส." ? 0 : (int)workSheet?.Cells[row, 12]?.GetValue().Replace(".00", "").ToInteger(); + r.SumB = workSheet?.Cells[row, 12]?.GetValue() == "ขส." ? 0.00 : (double)workSheet?.Cells[row, 12]?.GetValue(); r.PercentageB = workSheet?.Cells[row, 13]?.GetValue() == "ขส." ? 0.0 : (double)workSheet?.Cells[row, 13]?.GetValue(); r.BStatus = workSheet?.Cells[row, 14]?.GetValue(); - r.SumAB = workSheet?.Cells[row, 15]?.GetValue() == "ขส." ? 0 : (int)workSheet?.Cells[row, 15]?.GetValue().Replace(".00", "").ToInteger(); + r.SumAB = workSheet?.Cells[row, 15]?.GetValue() == "ขส." ? 0.00 : (double)workSheet?.Cells[row, 15]?.GetValue(); r.ABStatus = workSheet?.Cells[row, 17]?.GetValue(); r.FullC = (int)workSheet?.Cells[7, 20]?.GetValue().Replace("(", "").Replace(")", "").Replace("คะแนน", "").Trim().ToInteger(); - r.SumC = workSheet?.Cells[row, 20]?.GetValue() == "ขส." ? 0 : (int)workSheet?.Cells[row, 20]?.GetValue().Replace(".00", "").ToInteger(); + r.SumC = workSheet?.Cells[row, 20]?.GetValue() == "ขส." ? 0.00 : (double)workSheet?.Cells[row, 20]?.GetValue(); r.PercentageC = workSheet?.Cells[row, 21]?.GetValue() == "ขส." ? 0.0 : (double)workSheet?.Cells[row, 21]?.GetValue(); r.CStatus = workSheet?.Cells[row, 22]?.GetValue(); @@ -1321,7 +1321,7 @@ namespace BMA.EHR.Recruit.Service.Controllers } catch (Exception ex) { - await _minioService.DeleteFileAsync(Guid.Parse(import_doc_id)); + //await _minioService.DeleteFileAsync(Guid.Parse(import_doc_id)); return Error(ex); } finally @@ -1547,7 +1547,7 @@ namespace BMA.EHR.Recruit.Service.Controllers ExamName = p.RecruitImport!.Name, ExamOrder = p.RecruitImport.Order, ExamYear = p.RecruitImport.Year.ToThaiYear(), - Score = sr == null ? 0 : sr.SumA + sr.SumB + sr.SumC, + Score = sr == null ? 0.0 : sr.SumA + sr.SumB + sr.SumC, Number = sr == null ? "" : sr.Number, ExamCount = _recruitService.GetExamCount(p.CitizenId), ScoreExpire = p.RecruitImport.AnnouncementDate == null ? "" : p.RecruitImport.AnnouncementDate.Value.AddYears(2).ToThaiShortDate(), diff --git a/appsettings.Development.json b/appsettings.Development.json index 16406e5..bb4ce46 100644 --- a/appsettings.Development.json +++ b/appsettings.Development.json @@ -12,11 +12,12 @@ "Uri": "http://localhost:9200" }, "AllowedHosts": "*", - "ConnectionStrings": { - "MongoConnection": "mongodb://127.0.0.1:27017", - "DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", - "RecruitConnection": "server=192.168.1.80;user=root;password=adminVM123;database=bma_recruit_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" - }, + "ConnectionStrings": { + "MongoConnection": "mongodb://admin:adminVM123@127.0.0.1:27017", + "DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", + "OrgConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_organization_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", + "RecruitConnection": "server=192.168.1.80;user=root;password=adminVM123;database=bma_recruit_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" + }, "Jwt": { "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI", "Issuer": "https://id.frappet.synology.me/realms/bma-ehr" @@ -27,10 +28,11 @@ } }, "MinIO": { - "Endpoint": "http://127.0.0.1:9000", - "AccessKey": "XCiP1ubSyuGS5yDT", - "SecretKey": "LFnSRyk144oJERvump8UDxPcjjEyzgum", - "BucketName": "bma-recruit" + "Endpoint": "https://edm-s3.frappet.synology.me/", + "AccessKey": "XxtdnJajPjp3hHuKdOMn", + "SecretKey": "rVPzB05giC7bA400cUuIThzT4T9SGCcpcmL3tBBg", + "BucketName": "bma-ehr-fpt" }, - "API_KEY": "fKRL16yyEgbyTEJdsMw2h64tGSCmkW685PRtM3CygzX1JOSdptT9UJtpgWwKM8FybRTJups3GTFwj27ZRvlPdIkv3XgCoVJaD5LmR06ozuEPvCCRSdp2WFthg08V5xHc56fTPfZLpr1VmXrhd6dvYhHIqKkQUJR02Rlkss11cLRWEQOssEFVA4xdu2J5DIRO1EM5m7wRRvEwcDB4mYRXD9HH52SMq6iYqUWEWsMwLdbk7QW9yYESUEuzMW5gWrb6vIeWZxJV5bTz1PcWUyR7eO9Fyw1F5DiQYc9JgzTC1mW7cv31fEtTtrfbJYKIb5EbWilqIEUKC6A0UKBDDek35ML0006cqRVm0pvdOH6jeq7VQyYrhdXe59dBEyhYGUIfozoVBvW7Up4QBuOMjyPjSqJPlMBKwaseptfrblxQV1AOOivSBpf1ZcQyOZ8JktRtKUDSuXsmG0lsXwFlI3JCeSHdpVdgZWFYcJPegqfrB6KotR02t9AVkpLs1ZWrixwz" + "API": "https://bma-ehr.frappet.synology.me/api/v1", + "API_KEY": "fKRL16yyEgbyTEJdsMw2h64tGSCmkW685PRtM3CygzX1JOSdptT9UJtpgWwKM8FybRTJups3GTFwj27ZRvlPdIkv3XgCoVJaD5LmR06ozuEPvCCRSdp2WFthg08V5xHc56fTPfZLpr1VmXrhd6dvYhHIqKkQUJR02Rlkss11cLRWEQOssEFVA4xdu2J5DIRO1EM5m7wRRvEwcDB4mYRXD9HH52SMq6iYqUWEWsMwLdbk7QW9yYESUEuzMW5gWrb6vIeWZxJV5bTz1PcWUyR7eO9Fyw1F5DiQYc9JgzTC1mW7cv31fEtTtrfbJYKIb5EbWilqIEUKC6A0UKBDDek35ML0006cqRVm0pvdOH6jeq7VQyYrhdXe59dBEyhYGUIfozoVBvW7Up4QBuOMjyPjSqJPlMBKwaseptfrblxQV1AOOivSBpf1ZcQyOZ8JktRtKUDSuXsmG0lsXwFlI3JCeSHdpVdgZWFYcJPegqfrB6KotR02t9AVkpLs1ZWrixwz" } \ No newline at end of file diff --git a/appsettings.json b/appsettings.json index 0f42d6e..bb4ce46 100644 --- a/appsettings.json +++ b/appsettings.json @@ -28,10 +28,10 @@ } }, "MinIO": { - "Endpoint": "http://127.0.0.1:9000", - "AccessKey": "ZQOGEjHxDesiVIHR", - "SecretKey": "vKTpcxY0Wjjp775aDwNn1q6VWJu8EFb6", - "BucketName": "bma-recruit" + "Endpoint": "https://edm-s3.frappet.synology.me/", + "AccessKey": "XxtdnJajPjp3hHuKdOMn", + "SecretKey": "rVPzB05giC7bA400cUuIThzT4T9SGCcpcmL3tBBg", + "BucketName": "bma-ehr-fpt" }, "API": "https://bma-ehr.frappet.synology.me/api/v1", "API_KEY": "fKRL16yyEgbyTEJdsMw2h64tGSCmkW685PRtM3CygzX1JOSdptT9UJtpgWwKM8FybRTJups3GTFwj27ZRvlPdIkv3XgCoVJaD5LmR06ozuEPvCCRSdp2WFthg08V5xHc56fTPfZLpr1VmXrhd6dvYhHIqKkQUJR02Rlkss11cLRWEQOssEFVA4xdu2J5DIRO1EM5m7wRRvEwcDB4mYRXD9HH52SMq6iYqUWEWsMwLdbk7QW9yYESUEuzMW5gWrb6vIeWZxJV5bTz1PcWUyR7eO9Fyw1F5DiQYc9JgzTC1mW7cv31fEtTtrfbJYKIb5EbWilqIEUKC6A0UKBDDek35ML0006cqRVm0pvdOH6jeq7VQyYrhdXe59dBEyhYGUIfozoVBvW7Up4QBuOMjyPjSqJPlMBKwaseptfrblxQV1AOOivSBpf1ZcQyOZ8JktRtKUDSuXsmG0lsXwFlI3JCeSHdpVdgZWFYcJPegqfrB6KotR02t9AVkpLs1ZWrixwz" diff --git a/bin/Debug/net7.0/BMA.EHR.Recruit.Service.dll b/bin/Debug/net7.0/BMA.EHR.Recruit.Service.dll index 1eeca32..e2824a7 100644 Binary files a/bin/Debug/net7.0/BMA.EHR.Recruit.Service.dll and b/bin/Debug/net7.0/BMA.EHR.Recruit.Service.dll differ diff --git a/bin/Debug/net7.0/BMA.EHR.Recruit.Service.exe b/bin/Debug/net7.0/BMA.EHR.Recruit.Service.exe index e302bba..a5d0ba4 100644 Binary files a/bin/Debug/net7.0/BMA.EHR.Recruit.Service.exe and b/bin/Debug/net7.0/BMA.EHR.Recruit.Service.exe differ diff --git a/bin/Debug/net7.0/BMA.EHR.Recruit.Service.pdb b/bin/Debug/net7.0/BMA.EHR.Recruit.Service.pdb index 6bda4eb..fd1bc55 100644 Binary files a/bin/Debug/net7.0/BMA.EHR.Recruit.Service.pdb and b/bin/Debug/net7.0/BMA.EHR.Recruit.Service.pdb differ diff --git a/bin/Debug/net7.0/appsettings.Development.json b/bin/Debug/net7.0/appsettings.Development.json index 16406e5..bb4ce46 100644 --- a/bin/Debug/net7.0/appsettings.Development.json +++ b/bin/Debug/net7.0/appsettings.Development.json @@ -12,11 +12,12 @@ "Uri": "http://localhost:9200" }, "AllowedHosts": "*", - "ConnectionStrings": { - "MongoConnection": "mongodb://127.0.0.1:27017", - "DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", - "RecruitConnection": "server=192.168.1.80;user=root;password=adminVM123;database=bma_recruit_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" - }, + "ConnectionStrings": { + "MongoConnection": "mongodb://admin:adminVM123@127.0.0.1:27017", + "DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", + "OrgConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_organization_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", + "RecruitConnection": "server=192.168.1.80;user=root;password=adminVM123;database=bma_recruit_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" + }, "Jwt": { "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI", "Issuer": "https://id.frappet.synology.me/realms/bma-ehr" @@ -27,10 +28,11 @@ } }, "MinIO": { - "Endpoint": "http://127.0.0.1:9000", - "AccessKey": "XCiP1ubSyuGS5yDT", - "SecretKey": "LFnSRyk144oJERvump8UDxPcjjEyzgum", - "BucketName": "bma-recruit" + "Endpoint": "https://edm-s3.frappet.synology.me/", + "AccessKey": "XxtdnJajPjp3hHuKdOMn", + "SecretKey": "rVPzB05giC7bA400cUuIThzT4T9SGCcpcmL3tBBg", + "BucketName": "bma-ehr-fpt" }, - "API_KEY": "fKRL16yyEgbyTEJdsMw2h64tGSCmkW685PRtM3CygzX1JOSdptT9UJtpgWwKM8FybRTJups3GTFwj27ZRvlPdIkv3XgCoVJaD5LmR06ozuEPvCCRSdp2WFthg08V5xHc56fTPfZLpr1VmXrhd6dvYhHIqKkQUJR02Rlkss11cLRWEQOssEFVA4xdu2J5DIRO1EM5m7wRRvEwcDB4mYRXD9HH52SMq6iYqUWEWsMwLdbk7QW9yYESUEuzMW5gWrb6vIeWZxJV5bTz1PcWUyR7eO9Fyw1F5DiQYc9JgzTC1mW7cv31fEtTtrfbJYKIb5EbWilqIEUKC6A0UKBDDek35ML0006cqRVm0pvdOH6jeq7VQyYrhdXe59dBEyhYGUIfozoVBvW7Up4QBuOMjyPjSqJPlMBKwaseptfrblxQV1AOOivSBpf1ZcQyOZ8JktRtKUDSuXsmG0lsXwFlI3JCeSHdpVdgZWFYcJPegqfrB6KotR02t9AVkpLs1ZWrixwz" + "API": "https://bma-ehr.frappet.synology.me/api/v1", + "API_KEY": "fKRL16yyEgbyTEJdsMw2h64tGSCmkW685PRtM3CygzX1JOSdptT9UJtpgWwKM8FybRTJups3GTFwj27ZRvlPdIkv3XgCoVJaD5LmR06ozuEPvCCRSdp2WFthg08V5xHc56fTPfZLpr1VmXrhd6dvYhHIqKkQUJR02Rlkss11cLRWEQOssEFVA4xdu2J5DIRO1EM5m7wRRvEwcDB4mYRXD9HH52SMq6iYqUWEWsMwLdbk7QW9yYESUEuzMW5gWrb6vIeWZxJV5bTz1PcWUyR7eO9Fyw1F5DiQYc9JgzTC1mW7cv31fEtTtrfbJYKIb5EbWilqIEUKC6A0UKBDDek35ML0006cqRVm0pvdOH6jeq7VQyYrhdXe59dBEyhYGUIfozoVBvW7Up4QBuOMjyPjSqJPlMBKwaseptfrblxQV1AOOivSBpf1ZcQyOZ8JktRtKUDSuXsmG0lsXwFlI3JCeSHdpVdgZWFYcJPegqfrB6KotR02t9AVkpLs1ZWrixwz" } \ No newline at end of file diff --git a/bin/Debug/net7.0/appsettings.json b/bin/Debug/net7.0/appsettings.json index 0f42d6e..bb4ce46 100644 --- a/bin/Debug/net7.0/appsettings.json +++ b/bin/Debug/net7.0/appsettings.json @@ -28,10 +28,10 @@ } }, "MinIO": { - "Endpoint": "http://127.0.0.1:9000", - "AccessKey": "ZQOGEjHxDesiVIHR", - "SecretKey": "vKTpcxY0Wjjp775aDwNn1q6VWJu8EFb6", - "BucketName": "bma-recruit" + "Endpoint": "https://edm-s3.frappet.synology.me/", + "AccessKey": "XxtdnJajPjp3hHuKdOMn", + "SecretKey": "rVPzB05giC7bA400cUuIThzT4T9SGCcpcmL3tBBg", + "BucketName": "bma-ehr-fpt" }, "API": "https://bma-ehr.frappet.synology.me/api/v1", "API_KEY": "fKRL16yyEgbyTEJdsMw2h64tGSCmkW685PRtM3CygzX1JOSdptT9UJtpgWwKM8FybRTJups3GTFwj27ZRvlPdIkv3XgCoVJaD5LmR06ozuEPvCCRSdp2WFthg08V5xHc56fTPfZLpr1VmXrhd6dvYhHIqKkQUJR02Rlkss11cLRWEQOssEFVA4xdu2J5DIRO1EM5m7wRRvEwcDB4mYRXD9HH52SMq6iYqUWEWsMwLdbk7QW9yYESUEuzMW5gWrb6vIeWZxJV5bTz1PcWUyR7eO9Fyw1F5DiQYc9JgzTC1mW7cv31fEtTtrfbJYKIb5EbWilqIEUKC6A0UKBDDek35ML0006cqRVm0pvdOH6jeq7VQyYrhdXe59dBEyhYGUIfozoVBvW7Up4QBuOMjyPjSqJPlMBKwaseptfrblxQV1AOOivSBpf1ZcQyOZ8JktRtKUDSuXsmG0lsXwFlI3JCeSHdpVdgZWFYcJPegqfrB6KotR02t9AVkpLs1ZWrixwz" diff --git a/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs b/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs index 10d3974..d7287f8 100644 --- a/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs +++ b/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs @@ -1,7 +1,6 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -15,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("BMA.EHR.Recruit.Service")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+5c0dab5a1cd3e41ce69dc6660862416750ec16e0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d664dd42e96ed4445da0e53592bc3fda06ce9661")] [assembly: System.Reflection.AssemblyProductAttribute("BMA.EHR.Recruit.Service")] [assembly: System.Reflection.AssemblyTitleAttribute("BMA.EHR.Recruit.Service")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache b/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache index 691b0cf..d3c8830 100644 --- a/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache +++ b/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache @@ -1 +1 @@ -3118fd82d34b3baee039d7a31fb579087a3988a786672955f73a8abea243c1b9 +9cd25586526f13fb3262c1fc197baf26c24bea2154f7770e22bdfe2697ec8ab2 diff --git a/obj/Debug/net7.0/BMA.EHR.Recruit.Service.dll b/obj/Debug/net7.0/BMA.EHR.Recruit.Service.dll index 1eeca32..e2824a7 100644 Binary files a/obj/Debug/net7.0/BMA.EHR.Recruit.Service.dll and b/obj/Debug/net7.0/BMA.EHR.Recruit.Service.dll differ diff --git a/obj/Debug/net7.0/BMA.EHR.Recruit.Service.pdb b/obj/Debug/net7.0/BMA.EHR.Recruit.Service.pdb index 6bda4eb..fd1bc55 100644 Binary files a/obj/Debug/net7.0/BMA.EHR.Recruit.Service.pdb and b/obj/Debug/net7.0/BMA.EHR.Recruit.Service.pdb differ diff --git a/obj/Debug/net7.0/ref/BMA.EHR.Recruit.Service.dll b/obj/Debug/net7.0/ref/BMA.EHR.Recruit.Service.dll index 1f58b28..17d9721 100644 Binary files a/obj/Debug/net7.0/ref/BMA.EHR.Recruit.Service.dll and b/obj/Debug/net7.0/ref/BMA.EHR.Recruit.Service.dll differ diff --git a/obj/Debug/net7.0/refint/BMA.EHR.Recruit.Service.dll b/obj/Debug/net7.0/refint/BMA.EHR.Recruit.Service.dll index 1f58b28..17d9721 100644 Binary files a/obj/Debug/net7.0/refint/BMA.EHR.Recruit.Service.dll and b/obj/Debug/net7.0/refint/BMA.EHR.Recruit.Service.dll differ