hrms-bangkok/hrms-api-exam
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

แก้บัคจ่ายเงิน สร้างรอบคัดเลือก

Browse source
This commit is contained in:
Kittapath 2023-04-19 04:09:00 +07:00
parent 7b7dbb7475
commit ac3d2c9d26
7 changed files with 284 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Program.cs
View file

@ -105,7 +105,6 @@ var apiVersionDescriptionProvider = app.Services.GetRequiredService<IApiVersionD
if (app.Environment.IsDevelopment()) if (app.Environment.IsDevelopment())
{ {
app.UseSwagger(); app.UseSwagger();
//app.UseSwaggerUI();
app.UseSwaggerUI(options => app.UseSwaggerUI(options =>
{ {
foreach (var description in apiVersionDescriptionProvider.ApiVersionDescriptions) foreach (var description in apiVersionDescriptionProvider.ApiVersionDescriptions)

24
Services/CMSCandidateService.cs
View file

@ -353,8 +353,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
var cms = await createCMS(); var cms = await createCMS();
var periodExams = await _context.PeriodExams.AsQueryable() var periodExams = await _context.PeriodExams.AsQueryable()
.Where(x => x.AnnouncementStartDate <= DateTime.Now) .Where(x => x.AnnouncementStartDate.Date <= DateTime.Now.Date)
.Where(x => x.AnnouncementEndDate >= DateTime.Now) .Where(x => x.AnnouncementEndDate.Date >= DateTime.Now.Date)
.Include(x => x.PeriodExamImages) .Include(x => x.PeriodExamImages)
.OrderByDescending(x => x.AnnouncementStartDate) .OrderByDescending(x => x.AnnouncementStartDate)
.Select(x => new CMSExamResponseItem .Select(x => new CMSExamResponseItem
@ -397,8 +397,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
var cms = await createCMS(); var cms = await createCMS();
var periodExams = await _context.PeriodExams.AsQueryable() var periodExams = await _context.PeriodExams.AsQueryable()
.Where(x => x.AnnouncementStartDate <= DateTime.Now) .Where(x => x.AnnouncementStartDate.Date <= DateTime.Now.Date)
.Where(x => x.AnnouncementEndDate >= DateTime.Now) .Where(x => x.AnnouncementEndDate.Date >= DateTime.Now.Date)
.OrderByDescending(x => x.AnnouncementStartDate) .OrderByDescending(x => x.AnnouncementStartDate)
.Include(x => x.PeriodExamImages) .Include(x => x.PeriodExamImages)
.Select(x => new CMSExamResponseItem .Select(x => new CMSExamResponseItem
@ -484,14 +484,14 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
if (periodExam == null) if (periodExam == null)
throw new Exception(GlobalMessages.ExamNotFound); throw new Exception(GlobalMessages.ExamNotFound);
if (periodExam.Positions.Count() == 0) // if (periodExam.Positions.Count() == 0)
{ // {
periodExam.Positions.Add(new HomePageLinkResponseItem // periodExam.Positions.Add(new HomePageLinkResponseItem
{ // {
Title = "x.Name", // Title = "x.Name",
Url = $"{Configuration.GetValue<string>("Domain")}/exam/{periodExam.Id}/00000000-0000-0000-0000-000000000000" // Url = $"{Configuration.GetValue<string>("Domain")}/exam/{periodExam.Id}/00000000-0000-0000-0000-000000000000"
}); // });
} // }
var i = 0; var i = 0;
foreach (var item in periodExam.Images) foreach (var item in periodExam.Images)

33
Services/PeriodExamService.cs
View file

@ -251,22 +251,25 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
LastUpdateFullName = FullName ?? "", LastUpdateFullName = FullName ?? "",
}; };
foreach (var bank in inserted.BankExam) if (inserted.PaymentKrungThai == "payment2")
{ {
var bankExam = new BankExam foreach (var bank in inserted.BankExam)
{ {
PeriodExam = periodExam, var bankExam = new BankExam
AccountName = bank.AccountName, {
AccountNumber = bank.AccountNumber, PeriodExam = periodExam,
BankName = bank.BankName, AccountName = bank.AccountName,
CreatedAt = DateTime.Now, AccountNumber = bank.AccountNumber,
CreatedUserId = UserId ?? "", BankName = bank.BankName,
LastUpdatedAt = DateTime.Now, CreatedAt = DateTime.Now,
LastUpdateUserId = UserId ?? "", CreatedUserId = UserId ?? "",
CreatedFullName = FullName ?? "", LastUpdatedAt = DateTime.Now,
LastUpdateFullName = FullName ?? "", LastUpdateUserId = UserId ?? "",
}; CreatedFullName = FullName ?? "",
await _context.BankExams.AddAsync(bankExam); LastUpdateFullName = FullName ?? "",
};
await _context.BankExams.AddAsync(bankExam);
}
} }
foreach (var position in inserted.PositionExam) foreach (var position in inserted.PositionExam)
@ -333,7 +336,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
periodExam.LastUpdateUserId = UserId ?? ""; periodExam.LastUpdateUserId = UserId ?? "";
periodExam.LastUpdateFullName = FullName ?? ""; periodExam.LastUpdateFullName = FullName ?? "";
if (updated.PaymentKrungThai != "payment2") if (updated.PaymentKrungThai == "payment2")
{ {
foreach (var bank in periodExam.BankExam) foreach (var bank in periodExam.BankExam)
{ {

BIN
obj/Debug/net7.0/apphost.exe
View file

Binary file not shown.

504
obj/Debug/net7.0/project.razor.json
View file

File diff suppressed because it is too large Load diff

2
obj/project.assets.json
View file

@ -8440,7 +8440,7 @@
"privateAssets": "all" "privateAssets": "all"
} }
}, },
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json"
} }
} }
} }

2
obj/project.nuget.cache
View file

@ -1,6 +1,6 @@
{ {
"version": 2, "version": 2,
"dgSpecHash": "lByyu16jl2jM556O1T8dlyIx/VDvFB2JFOMrmhKkLT/k8+b+gPmdOXJ2gFJPebo7exLXNtdXcjhUf29jzv3G5g==", "dgSpecHash": "UamAJ+luCR5BwXfEV/O5TWqxblwcXJsT9e9lSupRwpSjVNNTPJ+/XkVZ/YNA1yBoG23TF1II8FLxdnStLW+fkA==",
"success": true, "success": true,
"projectFilePath": "D:\\BMA-EHR-Recurit-Exam-Service\\BMA.EHR.Recurit.Exam.Service.csproj", "projectFilePath": "D:\\BMA-EHR-Recurit-Exam-Service\\BMA.EHR.Recurit.Exam.Service.csproj",
"expectedPackageFiles": [ "expectedPackageFiles": [