Merge branch 'main' into develop

# Conflicts:
#	Controllers/RecruitController.cs

obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs

@@ -14,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")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+99fbac8dde8aff3bcac0b716dc2bbfe6eca6291d")]
 [assembly: System.Reflection.AssemblyProductAttribute("BMA.EHR.Recruit.Service")]
 [assembly: System.Reflection.AssemblyTitleAttribute("BMA.EHR.Recruit.Service")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache

@@ -1 +1 @@
-512d09f9200e77331649224c21826598aa475d21
+c4dd7f1c92c8efdb2778b878970c0beca5ed2d81fefaedfa6ef2563b7a393b81

obj/Debug/net7.0/BMA.EHR.Recruit.Service.GeneratedMSBuildEditorConfig.editorconfig

@@ -10,8 +10,12 @@ build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = BMA.EHR.Recruit.Service
 build_property.RootNamespace = BMA.EHR.Recruit.Service
 build_property.ProjectDir = d:\BMA-EHR-RECRUIT-SERVICE\
+build_property.EnableComHosting = 
+build_property.EnableGeneratedComInterfaceComImportInterop = 
 build_property.RazorLangVersion = 7.0
 build_property.SupportLocalizedComponentNames = 
 build_property.GenerateRazorMetadataSourceChecksumAttributes = 
 build_property.MSBuildProjectDirectory = d:\BMA-EHR-RECRUIT-SERVICE
 build_property._RazorSourceGeneratorDebug = 
+build_property.EffectiveAnalysisLevelStyle = 7.0
+build_property.EnableCodeStyleSeverity = 

obj/Debug/net7.0/BMA.EHR.Recruit.Service.MvcApplicationPartsAssemblyInfo.cs

@@ -1,7 +1,6 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     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.

obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-f90194874116b3fd32489ab0d1d2d802cafef28007489241ee3cc528b890009b
+cea941646f08568a90020fbbcf0a9eafd8d31b7642f5aa20a1cb047200f7c7ae

obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.FileListAbsolute.txt

@@ -925,8 +925,6 @@ D:\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\AWSSDK.S3.dll
 D:\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\AWSSDK.SecurityToken.dll
 D:\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\Azure.Core.dll
 D:\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\Azure.Identity.dll
-D:\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\BMA.EHR.Core.dll
-D:\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\BMA.EHR.Extensions.dll
 D:\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\BouncyCastle.Crypto.dll
 D:\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\DotNetEd.CoreAdmin.dll
 D:\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\Dapper.dll
@@ -1074,7 +1072,6 @@ D:\BMA-EHR-RECRUIT-SERVICE\obj\Debug\net7.0\staticwebassets.pack.json
 D:\BMA-EHR-RECRUIT-SERVICE\obj\Debug\net7.0\staticwebassets.build.json
 D:\BMA-EHR-RECRUIT-SERVICE\obj\Debug\net7.0\staticwebassets.development.json
 D:\BMA-EHR-RECRUIT-SERVICE\obj\Debug\net7.0\scopedcss\bundle\BMA.EHR.Recruit.Service.styles.css
-D:\BMA-EHR-RECRUIT-SERVICE\obj\Debug\net7.0\BMA.EHR.Recruit.Service.csproj.CopyComplete
 D:\BMA-EHR-RECRUIT-SERVICE\obj\Debug\net7.0\BMA.EHR.Recruit.Service.genruntimeconfig.cache
 D:\BMA-EHR-RECRUIT-SERVICE\obj\Debug\net7.0\ref\BMA.EHR.Recruit.Service.dll
 <<<<<<< HEAD
@@ -1086,13 +1083,6 @@ D:\Develop\Source\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\Templates\PassAExamLi
 D:\Develop\Source\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\Templates\PassExamList.xlsx
 D:\Develop\Source\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\BMA.EHR.Recruit.Service.staticwebassets.runtime.json
 =======
-D:\Develop\Source\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\appsettings.Development.json
-D:\Develop\Source\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\appsettings.json
-D:\Develop\Source\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\nuget.config
-D:\Develop\Source\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\BMA.EHR.Recruit.Service.staticwebassets.runtime.json
-D:\Develop\Source\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\Templates\ExamList.xlsx
-D:\Develop\Source\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\Templates\PassAExamList.xlsx
-D:\Develop\Source\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\Templates\PassExamList.xlsx
 >>>>>>> working
 D:\Develop\Source\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\BMA.EHR.Recruit.Service.exe
 D:\Develop\Source\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\BMA.EHR.Recruit.Service.deps.json
@@ -1268,3 +1258,8 @@ D:\Develop\Source\BMA-EHR-RECRUIT-SERVICE\obj\Debug\net7.0\BMA.EHR.Recruit.Servi
 D:\Develop\Source\BMA-EHR-RECRUIT-SERVICE\obj\Debug\net7.0\BMA.EHR.Recruit.Service.pdb
 D:\Develop\Source\BMA-EHR-RECRUIT-SERVICE\obj\Debug\net7.0\BMA.EHR.Recruit.Service.genruntimeconfig.cache
 D:\Develop\Source\BMA-EHR-RECRUIT-SERVICE\obj\Debug\net7.0\ref\BMA.EHR.Recruit.Service.dll
+D:\BMA-EHR-RECRUIT-SERVICE\bin\Debug\net7.0\BMA.EHR.Recruit.Service.staticwebassets.endpoints.json
+D:\BMA-EHR-RECRUIT-SERVICE\obj\Debug\net7.0\BMA.EHR.Recruit.Service.sourcelink.json
+D:\BMA-EHR-RECRUIT-SERVICE\obj\Debug\net7.0\staticwebassets.build.endpoints.json
+D:\BMA-EHR-RECRUIT-SERVICE\obj\Debug\net7.0\staticwebassets\msbuild.BMA.EHR.Recruit.Service.Microsoft.AspNetCore.StaticWebAssetEndpoints.props
+D:\BMA-EHR-RECRUIT-SERVICE\obj\Debug\net7.0\BMA.EHR..8088DF8F.Up2Date

obj/Debug/net7.0/BMA.EHR.Recruit.Service.genruntimeconfig.cache

@@ -1 +1 @@
-8be90be2a7340f54dd31815f5cbd0ec6523038ecfb40a3b3f369bbe88ed09523
+48b99599757630e72457bb87242ce14f53dc48b77c68e94f7d93523f2a74ffa8

obj/Debug/net7.0/BMA.EHR.Recruit.Service.xml

@@ -181,6 +181,26 @@
             <response code="401">ไม่ได้ Login เข้าระบบ</response>
             <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
         </member>
+        <member name="M:BMA.EHR.Recruit.Service.Controllers.RecruitController.report1(System.String)">
+            <summary>
+            รายงานจำนวนผู้เข้าสอบแข่งขันเพื่อบรรจุเข้ารับราชการเป็นข้าราชการ กทม. สามัญ
+            </summary>
+            <param name="year">ปีงบประมาณ</param>
+            <returns></returns>
+            <response code="200">เมื่อทำการอ่านข้อมูลจำนวนผู้เข้าสอบแข่งขันเพื่อบรรจุเข้ารับราชการเป็นข้าราชการ กทม. สามัญสำเร็จ</response>
+            <response code="401">ไม่ได้ Login เข้าระบบ</response>
+            <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        </member>
+        <member name="M:BMA.EHR.Recruit.Service.Controllers.RecruitController.report2(System.String)">
+            <summary>
+            รายงานจำนวนผู้สอบผ่านแข่งขันเพื่อบรรจุเข้ารับราชการเป็นข้าราชการ กทม. สามัญ
+            </summary>
+            <param name="year">ปีงบประมาณ</param>
+            <returns></returns>
+            <response code="200">เมื่อทำการอ่านข้อมูลจำนวนผู้สอบผ่านแข่งขันเพื่อบรรจุเข้ารับราชการเป็นข้าราชการ กทม. สามัญสำเร็จ</response>
+            <response code="401">ไม่ได้ Login เข้าระบบ</response>
+            <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        </member>
         <member name="M:BMA.EHR.Recruit.Service.Extensions.StringExtension.IsEmail(System.String)">
             <summary>
             Determines whether this instance is email.
@@ -411,6 +431,18 @@
         <member name="M:BMA.EHR.Recruit.Service.Migrations.AddImportImageandDocumentTable2.BuildTargetModel(Microsoft.EntityFrameworkCore.ModelBuilder)">
             <inheritdoc />
         </member>
+        <member name="T:BMA.EHR.Recruit.Service.Migrations.updatetableDisableaddpostype">
+            <inheritdoc />
+        </member>
+        <member name="M:BMA.EHR.Recruit.Service.Migrations.updatetableDisableaddpostype.Up(Microsoft.EntityFrameworkCore.Migrations.MigrationBuilder)">
+            <inheritdoc />
+        </member>
+        <member name="M:BMA.EHR.Recruit.Service.Migrations.updatetableDisableaddpostype.Down(Microsoft.EntityFrameworkCore.Migrations.MigrationBuilder)">
+            <inheritdoc />
+        </member>
+        <member name="M:BMA.EHR.Recruit.Service.Migrations.updatetableDisableaddpostype.BuildTargetModel(Microsoft.EntityFrameworkCore.ModelBuilder)">
+            <inheritdoc />
+        </member>
         <member name="T:BMA.EHR.Recruit.Service.Requests.Recruits.PostRecruitImportRequest">
             <summary>
             ตัวแปรสำหรับสร้างข้อมูลการสอบแข่งขัน

obj/Debug/net7.0/Sentry.Attributes.cs

@@ -10,7 +10,7 @@
 using System;
 using System.Reflection;
 
-[assembly: System.Reflection.AssemblyMetadata("Sentry.ProjectDirectory", "d:\\BMA-EHR-RECRUIT-SERVICE\\")]
+[assembly: System.Reflection.AssemblyMetadata("Sentry.ProjectDirectory", "D:\\BMA-EHR-RECRUIT-SERVICE\\")]
 
 // Generated by the MSBuild WriteCodeFragment class.
 

obj/Debug/net7.0/staticwebassets/msbuild.build.BMA.EHR.Recruit.Service.props

@@ -1,3 +1,4 @@
 <Project>
+  <Import Project="Microsoft.AspNetCore.StaticWebAssetEndpoints.props" />
   <Import Project="Microsoft.AspNetCore.StaticWebAssets.props" />
 </Project>