แก้ส่งออกข้อมูลเรียงลำดับ

2023-06-16 16:16:35 +07:00 · 2023-06-16 16:16:35 +07:00 · f6f52f68e9
commit f6f52f68e9
parent 27b2c187ee
25 changed files with 61 additions and 46 deletions
--- a/BMA.EHR.Recruit.Service.csproj
+++ b/BMA.EHR.Recruit.Service.csproj
@ -21,7 +21,7 @@
 	<ItemGroup>
 		<PackageReference Include="AWSSDK.S3" Version="3.7.103.35" />
 		<PackageReference Include="BMA.EHR.Core" Version="1.0.0" />
-		<PackageReference Include="BMA.EHR.Extensions" Version="1.0.1" />
+		<PackageReference Include="BMA.EHR.Extensions" Version="1.0.4" />
 		<PackageReference Include="CoreAdmin" Version="2.7.0" />
 		<PackageReference Include="EPPlus" Version="6.1.3" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.3" />
--- a/Controllers/RecruitController.cs
+++ b/Controllers/RecruitController.cs
@ -1857,6 +1857,7 @@ namespace BMA.EHR.Recruit.Service.Controllers
            {
                var result = (from r in data.Recruits.ToList()
                              join s in data_pass.ScoreImport.Scores.Where(x => x.AStatus == "ผ่าน").ToList() on r.ExamId equals s.ExamId
+                              orderby s.SumA descending
                              select new
                              {
                                  r.ExamId,
@ -1972,7 +1973,9 @@ namespace BMA.EHR.Recruit.Service.Controllers
                                  Status = s.ExamStatus,
                                  r.PositionName,
                                  s.Number
-                              }).ToList();
+                              }).ToList()
+                              .OrderByDescending(x => x.Sum)
+                              .ToList();

                // copy template
                System.IO.File.Copy(template_file, exportFile);
--- a/Services/MinIOService.cs
+++ b/Services/MinIOService.cs
@ -10,7 +10,6 @@ using BMA.EHR.Recruit.Service.Core;
 using BMA.EHR.Recruit.Service.Data;
 using BMA.EHR.Recruit.Service.Models.Documents;
 using BMA.EHR.Recruit.Service.Responses.Document;
-using Elasticsearch.Net;
 using Microsoft.EntityFrameworkCore;

 namespace BMA.EHR.Recruit.Service.Services
@ -188,7 +187,7 @@ namespace BMA.EHR.Recruit.Service.Services

 		public async Task<string> GetFilePath(Guid fileId)
 		{
-		
+
 			var doc = await _context.Documents.AsQueryable()
 								.FirstOrDefaultAsync(x => x.Id == fileId);

--- a/bin/Debug/net7.0/BMA.EHR.Extensions.dll
+++ b/bin/Debug/net7.0/BMA.EHR.Extensions.dll
--- a/bin/Debug/net7.0/BMA.EHR.Recruit.Service.deps.json
+++ b/bin/Debug/net7.0/BMA.EHR.Recruit.Service.deps.json
@ -10,7 +10,7 @@
        "dependencies": {
          "AWSSDK.S3": "3.7.103.35",
          "BMA.EHR.Core": "1.0.0",
-          "BMA.EHR.Extensions": "1.0.1",
+          "BMA.EHR.Extensions": "1.0.4",
          "CoreAdmin": "2.7.0",
          "EPPlus": "6.1.3",
          "Microsoft.AspNetCore.Authentication.JwtBearer": "7.0.3",
@ -115,11 +115,11 @@
          }
        }
      },
-      "BMA.EHR.Extensions/1.0.1": {
+      "BMA.EHR.Extensions/1.0.4": {
        "runtime": {
          "lib/net7.0/BMA.EHR.Extensions.dll": {
-            "assemblyVersion": "1.0.0.0",
-            "fileVersion": "1.0.0.0"
+            "assemblyVersion": "1.0.4.0",
+            "fileVersion": "1.0.4.0"
          }
        }
      },
@ -2891,12 +2891,12 @@
      "path": "bma.ehr.core/1.0.0",
      "hashPath": "bma.ehr.core.1.0.0.nupkg.sha512"
    },
-    "BMA.EHR.Extensions/1.0.1": {
+    "BMA.EHR.Extensions/1.0.4": {
      "type": "package",
      "serviceable": true,
-      "sha512": "sha512-Ogwvfr3DPck/Ic9yJ3q07KUmp6T7qvpjrwK9W5GdPLYLBCrAYG7X6DWJADVQrTdUCeDT7MjxRE39KC9u1dmSvw==",
-      "path": "bma.ehr.extensions/1.0.1",
-      "hashPath": "bma.ehr.extensions.1.0.1.nupkg.sha512"
+      "sha512": "sha512-rXAYg7HV5RWQ8ZwDNQ8EBDgGgRQmWtVAo4RuU5kWl5jJRpdoayiMktPGbahnxTbazVMynahsibiOLylzGyTpyg==",
+      "path": "bma.ehr.extensions/1.0.4",
+      "hashPath": "bma.ehr.extensions.1.0.4.nupkg.sha512"
    },
    "BouncyCastle.NetCore/1.8.5": {
      "type": "package",
--- a/bin/Debug/net7.0/BMA.EHR.Recruit.Service.dll
+++ b/bin/Debug/net7.0/BMA.EHR.Recruit.Service.dll
--- a/bin/Debug/net7.0/BMA.EHR.Recruit.Service.exe
+++ b/bin/Debug/net7.0/BMA.EHR.Recruit.Service.exe
--- a/bin/Debug/net7.0/BMA.EHR.Recruit.Service.pdb
+++ b/bin/Debug/net7.0/BMA.EHR.Recruit.Service.pdb
--- a/bin/Debug/net7.0/appsettings.Development.json
+++ b/bin/Debug/net7.0/appsettings.Development.json
@ -14,7 +14,8 @@
    "AllowedHosts": "*",
    "ConnectionStrings": {
        "MongoConnection": "mongodb://127.0.0.1:27017",
-        "DefaultConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_recruit;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
+        "DefaultConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_recruit;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
+        "MetadataConnection": "server=127.0.0.1;user=root;password=P@ssw0rd;port=3308;database=bma_ehr;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
    },
    "Jwt": {
        "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
--- a/bin/Debug/net7.0/appsettings.json
+++ b/bin/Debug/net7.0/appsettings.json
@ -14,7 +14,8 @@
    "AllowedHosts": "*",
    "ConnectionStrings": {
        "MongoConnection": "mongodb://admin:adminVM123@127.0.0.1:27017",
-        "DefaultConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_recruit;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
+        "DefaultConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_recruit;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
+        "MetadataConnection": "server=192.168.1.9;user=root;password=adminVM123;database=bma_ehr;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
    },
    "Jwt": {
        "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
--- a/bin/Debug/net7.0/global.json
+++ b/bin/Debug/net7.0/global.json
@ -1,5 +0,0 @@
-{
-    "sdk": {
-        "version": "7.0.201"
-    }
-}
--- a/global.json
+++ b/global.json
@ -1,5 +0,0 @@
-{
-    "sdk": {
-        "version": "7.0.201"
-    }
-}
--- a/obj/BMA.EHR.Recruit.Service.csproj.nuget.dgspec.json
+++ b/obj/BMA.EHR.Recruit.Service.csproj.nuget.dgspec.json
@ -27,7 +27,7 @@
        "sources": {
          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
          "C:\\Program Files\\dotnet\\library-packs": {},
-          "https://api.nuget.org/v3/index.json": {}
+          "D:\\Develop\\Source\\_Private\\ctw\\The.Balcony.Project\\Balcony.Backend\\Components": {}
        },
        "frameworks": {
          "net7.0": {
@ -55,7 +55,7 @@
            },
            "BMA.EHR.Extensions": {
              "target": "Package",
-              "version": "[1.0.1, )"
+              "version": "[1.0.4, )"
            },
            "CoreAdmin": {
              "target": "Package",
@ -187,7 +187,7 @@
              "privateAssets": "all"
            }
          },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.400-preview.23274.1\\RuntimeIdentifierGraph.json"
        }
      }
    }
--- a/obj/BMA.EHR.Recruit.Service.csproj.nuget.g.props
+++ b/obj/BMA.EHR.Recruit.Service.csproj.nuget.g.props
@ -7,7 +7,7 @@
    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\suphonchai\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.5.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
  </PropertyGroup>
  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
    <SourceRoot Include="C:\Users\suphonchai\.nuget\packages\" />
--- a/obj/Debug/net7.0/.NETCoreApp,Version=v7.0.AssemblyAttributes.cs
+++ b/obj/Debug/net7.0/.NETCoreApp,Version=v7.0.AssemblyAttributes.cs
@ -1,4 +1,4 @@
 // <autogenerated />
 using System;
 using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v7.0", FrameworkDisplayName = ".NET 7.0")]
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v7.0", FrameworkDisplayName = ".NET 7.0")]
--- a/obj/Debug/net7.0/BMA.EHR.Recruit.Service.assets.cache
+++ b/obj/Debug/net7.0/BMA.EHR.Recruit.Service.assets.cache
--- a/obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.AssemblyReference.cache
+++ b/obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.AssemblyReference.cache
--- a/obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.CoreCompileInputs.cache
+++ b/obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.CoreCompileInputs.cache
@ -1 +1 @@
-18236251b3f3725026b46738126686572dc71236
+910a2a07368aa071052d54d5dd8d25541c57fa3d
--- a/obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.FileListAbsolute.txt
+++ b/obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.FileListAbsolute.txt
@ -361,7 +361,6 @@ C:/Users/suphonchai/Develop/Source/BMA-EHR/BMA-EHR-Recruit-Service/obj/Debug/net
 D:/Develop/Source/BMA-EHR/BMA-EHR-Recruit-Service/bin/Debug/net7.0/nuget.config
 D:/Develop/Source/BMA-EHR/BMA-EHR-Recruit-Service/bin/Debug/net7.0/appsettings.Development.json
 D:/Develop/Source/BMA-EHR/BMA-EHR-Recruit-Service/bin/Debug/net7.0/appsettings.json
-D:/Develop/Source/BMA-EHR/BMA-EHR-Recruit-Service/bin/Debug/net7.0/global.json
 D:/Develop/Source/BMA-EHR/BMA-EHR-Recruit-Service/bin/Debug/net7.0/BMA.EHR.Recruit.Service.staticwebassets.runtime.json
 D:/Develop/Source/BMA-EHR/BMA-EHR-Recruit-Service/bin/Debug/net7.0/BMA.EHR.Recruit.Service.exe
 D:/Develop/Source/BMA-EHR/BMA-EHR-Recruit-Service/bin/Debug/net7.0/BMA.EHR.Recruit.Service.deps.json
@ -721,7 +720,6 @@ D:/Develop/Source/BMA-EHR/BMA-EHR-Recruit-Service/obj/Debug/net7.0/ref/BMA.EHR.R
 D:\Develop\Source\BMA-EHR\BMA-EHR-Recruit-Service\bin\Debug\net7.0\nuget.config
 D:\Develop\Source\BMA-EHR\BMA-EHR-Recruit-Service\bin\Debug\net7.0\appsettings.Development.json
 D:\Develop\Source\BMA-EHR\BMA-EHR-Recruit-Service\bin\Debug\net7.0\appsettings.json
-D:\Develop\Source\BMA-EHR\BMA-EHR-Recruit-Service\bin\Debug\net7.0\global.json
 D:\Develop\Source\BMA-EHR\BMA-EHR-Recruit-Service\bin\Debug\net7.0\BMA.EHR.Recruit.Service.staticwebassets.runtime.json
 D:\Develop\Source\BMA-EHR\BMA-EHR-Recruit-Service\bin\Debug\net7.0\BMA.EHR.Recruit.Service.exe
 D:\Develop\Source\BMA-EHR\BMA-EHR-Recruit-Service\bin\Debug\net7.0\BMA.EHR.Recruit.Service.deps.json
--- a/obj/Debug/net7.0/BMA.EHR.Recruit.Service.dll
+++ b/obj/Debug/net7.0/BMA.EHR.Recruit.Service.dll
--- a/obj/Debug/net7.0/BMA.EHR.Recruit.Service.pdb
+++ b/obj/Debug/net7.0/BMA.EHR.Recruit.Service.pdb
--- a/obj/Debug/net7.0/ref/BMA.EHR.Recruit.Service.dll
+++ b/obj/Debug/net7.0/ref/BMA.EHR.Recruit.Service.dll
--- a/obj/Debug/net7.0/refint/BMA.EHR.Recruit.Service.dll
+++ b/obj/Debug/net7.0/refint/BMA.EHR.Recruit.Service.dll
--- a/obj/project.assets.json
+++ b/obj/project.assets.json
@ -100,7 +100,7 @@
          "lib/net7.0/BMA.EHR.Core.dll": {}
        }
      },
-      "BMA.EHR.Extensions/1.0.1": {
+      "BMA.EHR.Extensions/1.0.8": {
        "type": "package",
        "compile": {
          "lib/net7.0/BMA.EHR.Extensions.dll": {}
@ -5261,7 +5261,7 @@
      ]
    },
    "BMA.EHR.Core/1.0.0": {
-      "sha512": "ORq4lAjT5AunjuPekgFJPywsljkVVOJ0rvEQ3VKR+MAhHM3cmaMIieDGD03YV5F286Sw8mKRNaBZKpJzCOrYkw==",
+      "sha512": "d6BdoeFq0BLoL54AY2+ftRVJTLczcJ0AadPP2c4QtFN6eU8xGRYjMlR65uxVdzij+TBqbcl0MbQuoUn6LAJZNw==",
      "type": "package",
      "path": "bma.ehr.core/1.0.0",
      "files": [
@ -5271,13 +5271,13 @@
        "lib/net7.0/BMA.EHR.Core.dll"
      ]
    },
-    "BMA.EHR.Extensions/1.0.1": {
-      "sha512": "Ogwvfr3DPck/Ic9yJ3q07KUmp6T7qvpjrwK9W5GdPLYLBCrAYG7X6DWJADVQrTdUCeDT7MjxRE39KC9u1dmSvw==",
+    "BMA.EHR.Extensions/1.0.8": {
+      "sha512": "JwxBWr4/XlIWQUmnNCr5ABWpFyJTAij0k0F8b/rgkXea+1jjGG3NrzGR1Dlxe5RGBLi1Ej/U23M3KjXqvYJdiQ==",
      "type": "package",
-      "path": "bma.ehr.extensions/1.0.1",
+      "path": "bma.ehr.extensions/1.0.8",
      "files": [
        ".nupkg.metadata",
-        "bma.ehr.extensions.1.0.1.nupkg.sha512",
+        "bma.ehr.extensions.1.0.8.nupkg.sha512",
        "bma.ehr.extensions.nuspec",
        "lib/net7.0/BMA.EHR.Extensions.dll"
      ]
@ -13703,7 +13703,7 @@
    "net7.0": [
      "AWSSDK.S3 >= 3.7.103.35",
      "BMA.EHR.Core >= 1.0.0",
-      "BMA.EHR.Extensions >= 1.0.1",
+      "BMA.EHR.Extensions >= 1.0.4",
      "CoreAdmin >= 2.7.0",
      "EPPlus >= 6.1.3",
      "Microsoft.AspNetCore.Authentication.JwtBearer >= 7.0.3",
@ -13760,7 +13760,7 @@
      "sources": {
        "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
        "C:\\Program Files\\dotnet\\library-packs": {},
-        "https://api.nuget.org/v3/index.json": {}
+        "D:\\Develop\\Source\\_Private\\ctw\\The.Balcony.Project\\Balcony.Backend\\Components": {}
      },
      "frameworks": {
        "net7.0": {
@ -13788,7 +13788,7 @@
          },
          "BMA.EHR.Extensions": {
            "target": "Package",
-            "version": "[1.0.1, )"
+            "version": "[1.0.4, )"
          },
          "CoreAdmin": {
            "target": "Package",
@ -13920,8 +13920,20 @@
            "privateAssets": "all"
          }
        },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.400-preview.23274.1\\RuntimeIdentifierGraph.json"
      }
    }
-  }
+  },
+  "logs": [
+    {
+      "code": "NU1603",
+      "level": "Warning",
+      "warningLevel": 1,
+      "message": "BMA.EHR.Recruit.Service depends on BMA.EHR.Extensions (>= 1.0.4) but BMA.EHR.Extensions 1.0.4 was not found. An approximate best match of BMA.EHR.Extensions 1.0.8 was resolved.",
+      "libraryId": "BMA.EHR.Extensions",
+      "targetGraphs": [
+        "net7.0"
+      ]
+    }
+  ]
 }
--- a/obj/project.nuget.cache
+++ b/obj/project.nuget.cache
@ -1,6 +1,6 @@
 {
  "version": 2,
-  "dgSpecHash": "wwL7jfbtyqKoIC2sTXagCGqfHf4n51CJ6qkvce0iceTUavGY+JVtN++eF/274kGMddl63PkaB6O3QxxiNizXig==",
+  "dgSpecHash": "IhJrqiattRiX/NdV4v5d8sYSGOgw/4YoM0PNjgc2trN4fl+YWelVseEpgHnO73WKdDiFRgxSpvDhwhus0B7Veg==",
  "success": true,
  "projectFilePath": "D:\\Develop\\Source\\BMA-EHR\\BMA-EHR-Recruit-Service\\BMA.EHR.Recruit.Service.csproj",
  "expectedPackageFiles": [
@ -10,7 +10,7 @@
    "C:\\Users\\suphonchai\\.nuget\\packages\\azure.core\\1.24.0\\azure.core.1.24.0.nupkg.sha512",
    "C:\\Users\\suphonchai\\.nuget\\packages\\azure.identity\\1.6.0\\azure.identity.1.6.0.nupkg.sha512",
    "C:\\Users\\suphonchai\\.nuget\\packages\\bma.ehr.core\\1.0.0\\bma.ehr.core.1.0.0.nupkg.sha512",
-    "C:\\Users\\suphonchai\\.nuget\\packages\\bma.ehr.extensions\\1.0.1\\bma.ehr.extensions.1.0.1.nupkg.sha512",
+    "C:\\Users\\suphonchai\\.nuget\\packages\\bma.ehr.extensions\\1.0.8\\bma.ehr.extensions.1.0.8.nupkg.sha512",
    "C:\\Users\\suphonchai\\.nuget\\packages\\bouncycastle.netcore\\1.8.5\\bouncycastle.netcore.1.8.5.nupkg.sha512",
    "C:\\Users\\suphonchai\\.nuget\\packages\\coreadmin\\2.7.0\\coreadmin.2.7.0.nupkg.sha512",
    "C:\\Users\\suphonchai\\.nuget\\packages\\dapper\\2.0.123\\dapper.2.0.123.nupkg.sha512",
@ -295,5 +295,16 @@
    "C:\\Users\\suphonchai\\.nuget\\packages\\watchdog.net\\1.4.6\\watchdog.net.1.4.6.nupkg.sha512",
    "C:\\Users\\suphonchai\\.nuget\\packages\\zstdsharp.port\\0.6.2\\zstdsharp.port.0.6.2.nupkg.sha512"
  ],
-  "logs": []
+  "logs": [
+    {
+      "code": "NU1603",
+      "level": "Warning",
+      "warningLevel": 1,
+      "message": "BMA.EHR.Recruit.Service depends on BMA.EHR.Extensions (>= 1.0.4) but BMA.EHR.Extensions 1.0.4 was not found. An approximate best match of BMA.EHR.Extensions 1.0.8 was resolved.",
+      "libraryId": "BMA.EHR.Extensions",
+      "targetGraphs": [
+        "net7.0"
+      ]
+    }
+  ]
 }