แก้บัคจ่ายเงิน สร้างรอบคัดเลือก
This commit is contained in:
parent
7b7dbb7475
commit
ac3d2c9d26
7 changed files with 284 additions and 282 deletions
|
|
@ -105,7 +105,6 @@ var apiVersionDescriptionProvider = app.Services.GetRequiredService<IApiVersionD
|
|||
if (app.Environment.IsDevelopment())
|
||||
{
|
||||
app.UseSwagger();
|
||||
//app.UseSwaggerUI();
|
||||
app.UseSwaggerUI(options =>
|
||||
{
|
||||
foreach (var description in apiVersionDescriptionProvider.ApiVersionDescriptions)
|
||||
|
|
|
|||
|
|
@ -353,8 +353,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
|
|||
var cms = await createCMS();
|
||||
|
||||
var periodExams = await _context.PeriodExams.AsQueryable()
|
||||
.Where(x => x.AnnouncementStartDate <= DateTime.Now)
|
||||
.Where(x => x.AnnouncementEndDate >= DateTime.Now)
|
||||
.Where(x => x.AnnouncementStartDate.Date <= DateTime.Now.Date)
|
||||
.Where(x => x.AnnouncementEndDate.Date >= DateTime.Now.Date)
|
||||
.Include(x => x.PeriodExamImages)
|
||||
.OrderByDescending(x => x.AnnouncementStartDate)
|
||||
.Select(x => new CMSExamResponseItem
|
||||
|
|
@ -397,8 +397,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
|
|||
var cms = await createCMS();
|
||||
|
||||
var periodExams = await _context.PeriodExams.AsQueryable()
|
||||
.Where(x => x.AnnouncementStartDate <= DateTime.Now)
|
||||
.Where(x => x.AnnouncementEndDate >= DateTime.Now)
|
||||
.Where(x => x.AnnouncementStartDate.Date <= DateTime.Now.Date)
|
||||
.Where(x => x.AnnouncementEndDate.Date >= DateTime.Now.Date)
|
||||
.OrderByDescending(x => x.AnnouncementStartDate)
|
||||
.Include(x => x.PeriodExamImages)
|
||||
.Select(x => new CMSExamResponseItem
|
||||
|
|
@ -484,14 +484,14 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
|
|||
if (periodExam == null)
|
||||
throw new Exception(GlobalMessages.ExamNotFound);
|
||||
|
||||
if (periodExam.Positions.Count() == 0)
|
||||
{
|
||||
periodExam.Positions.Add(new HomePageLinkResponseItem
|
||||
{
|
||||
Title = "x.Name",
|
||||
Url = $"{Configuration.GetValue<string>("Domain")}/exam/{periodExam.Id}/00000000-0000-0000-0000-000000000000"
|
||||
});
|
||||
}
|
||||
// if (periodExam.Positions.Count() == 0)
|
||||
// {
|
||||
// periodExam.Positions.Add(new HomePageLinkResponseItem
|
||||
// {
|
||||
// Title = "x.Name",
|
||||
// Url = $"{Configuration.GetValue<string>("Domain")}/exam/{periodExam.Id}/00000000-0000-0000-0000-000000000000"
|
||||
// });
|
||||
// }
|
||||
|
||||
var i = 0;
|
||||
foreach (var item in periodExam.Images)
|
||||
|
|
|
|||
|
|
@ -251,22 +251,25 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
|
|||
LastUpdateFullName = FullName ?? "",
|
||||
};
|
||||
|
||||
foreach (var bank in inserted.BankExam)
|
||||
if (inserted.PaymentKrungThai == "payment2")
|
||||
{
|
||||
var bankExam = new BankExam
|
||||
foreach (var bank in inserted.BankExam)
|
||||
{
|
||||
PeriodExam = periodExam,
|
||||
AccountName = bank.AccountName,
|
||||
AccountNumber = bank.AccountNumber,
|
||||
BankName = bank.BankName,
|
||||
CreatedAt = DateTime.Now,
|
||||
CreatedUserId = UserId ?? "",
|
||||
LastUpdatedAt = DateTime.Now,
|
||||
LastUpdateUserId = UserId ?? "",
|
||||
CreatedFullName = FullName ?? "",
|
||||
LastUpdateFullName = FullName ?? "",
|
||||
};
|
||||
await _context.BankExams.AddAsync(bankExam);
|
||||
var bankExam = new BankExam
|
||||
{
|
||||
PeriodExam = periodExam,
|
||||
AccountName = bank.AccountName,
|
||||
AccountNumber = bank.AccountNumber,
|
||||
BankName = bank.BankName,
|
||||
CreatedAt = DateTime.Now,
|
||||
CreatedUserId = UserId ?? "",
|
||||
LastUpdatedAt = DateTime.Now,
|
||||
LastUpdateUserId = UserId ?? "",
|
||||
CreatedFullName = FullName ?? "",
|
||||
LastUpdateFullName = FullName ?? "",
|
||||
};
|
||||
await _context.BankExams.AddAsync(bankExam);
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var position in inserted.PositionExam)
|
||||
|
|
@ -333,7 +336,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
|
|||
periodExam.LastUpdateUserId = UserId ?? "";
|
||||
periodExam.LastUpdateFullName = FullName ?? "";
|
||||
|
||||
if (updated.PaymentKrungThai != "payment2")
|
||||
if (updated.PaymentKrungThai == "payment2")
|
||||
{
|
||||
foreach (var bank in periodExam.BankExam)
|
||||
{
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
|
@ -8440,7 +8440,7 @@
|
|||
"privateAssets": "all"
|
||||
}
|
||||
},
|
||||
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
|
||||
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"version": 2,
|
||||
"dgSpecHash": "lByyu16jl2jM556O1T8dlyIx/VDvFB2JFOMrmhKkLT/k8+b+gPmdOXJ2gFJPebo7exLXNtdXcjhUf29jzv3G5g==",
|
||||
"dgSpecHash": "UamAJ+luCR5BwXfEV/O5TWqxblwcXJsT9e9lSupRwpSjVNNTPJ+/XkVZ/YNA1yBoG23TF1II8FLxdnStLW+fkA==",
|
||||
"success": true,
|
||||
"projectFilePath": "D:\\BMA-EHR-Recurit-Exam-Service\\BMA.EHR.Recurit.Exam.Service.csproj",
|
||||
"expectedPackageFiles": [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue