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-06-02 13:18:47 +07:00
parent c11b3b68ae
commit e8cb94c541
6 changed files with 3312 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Data/Migrations/ApplicationDbContextModelSnapshot.cs
View file

@ -2134,7 +2134,6 @@ namespace BMA.EHR.Recurit.Exam.Service.Data.Migrations
.HasAnnotation("Relational:JsonPropertyName", "id");
b.Property<DateTime?>("AnnouncementDate")
.IsRequired()
.HasColumnType("datetime(6)")
.HasColumnOrder(5)
.HasComment("วันประกาศผลสอบ");
@ -2189,7 +2188,6 @@ namespace BMA.EHR.Recurit.Exam.Service.Data.Migrations
.HasComment("รายละเอียดสมัครสอบ");
b.Property<DateTime?>("ExamDate")
.IsRequired()
.HasColumnType("datetime(6)")
.HasComment("วันที่สอบ");
@ -2251,7 +2249,6 @@ namespace BMA.EHR.Recurit.Exam.Service.Data.Migrations
.HasComment("ชื่อหน่วยงาน");
b.Property<DateTime?>("PaymentEndDate")
.IsRequired()
.HasColumnType("datetime(6)")
.HasColumnOrder(4)
.HasComment("วันสิ้นสุดชำระเงิน");
@ -2261,19 +2258,16 @@ namespace BMA.EHR.Recurit.Exam.Service.Data.Migrations
.HasComment("ชำระเงินผ่านกรุงไทย");
b.Property<DateTime?>("PaymentStartDate")
.IsRequired()
.HasColumnType("datetime(6)")
.HasColumnOrder(3)
.HasComment("วันเริ่มชำระเงิน");
b.Property<DateTime?>("RegisterEndDate")
.IsRequired()
.HasColumnType("datetime(6)")
.HasColumnOrder(2)
.HasComment("วันสิ้นสุดสมัครสอบ");
b.Property<DateTime?>("RegisterStartDate")
.IsRequired()
.HasColumnType("datetime(6)")
.HasColumnOrder(1)
.HasComment("วันเริ่มสมัครสอบ");

2863
Migrations/20230602045202_update table periodexam date can null.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

151
Migrations/20230602045202_update table periodexam date can null.cs Normal file
View file

@ -0,0 +1,151 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Recurit.Exam.Service.Migrations
{
/// <inheritdoc />
public partial class updatetableperiodexamdatecannull : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<DateTime>(
name: "RegisterStartDate",
table: "PeriodExams",
type: "datetime(6)",
nullable: true,
comment: "วันเริ่มสมัครสอบ",
oldClrType: typeof(DateTime),
oldType: "datetime(6)",
oldComment: "วันเริ่มสมัครสอบ");
migrationBuilder.AlterColumn<DateTime>(
name: "RegisterEndDate",
table: "PeriodExams",
type: "datetime(6)",
nullable: true,
comment: "วันสิ้นสุดสมัครสอบ",
oldClrType: typeof(DateTime),
oldType: "datetime(6)",
oldComment: "วันสิ้นสุดสมัครสอบ");
migrationBuilder.AlterColumn<DateTime>(
name: "PaymentStartDate",
table: "PeriodExams",
type: "datetime(6)",
nullable: true,
comment: "วันเริ่มชำระเงิน",
oldClrType: typeof(DateTime),
oldType: "datetime(6)",
oldComment: "วันเริ่มชำระเงิน");
migrationBuilder.AlterColumn<DateTime>(
name: "PaymentEndDate",
table: "PeriodExams",
type: "datetime(6)",
nullable: true,
comment: "วันสิ้นสุดชำระเงิน",
oldClrType: typeof(DateTime),
oldType: "datetime(6)",
oldComment: "วันสิ้นสุดชำระเงิน");
migrationBuilder.AlterColumn<DateTime>(
name: "ExamDate",
table: "PeriodExams",
type: "datetime(6)",
nullable: true,
comment: "วันที่สอบ",
oldClrType: typeof(DateTime),
oldType: "datetime(6)",
oldComment: "วันที่สอบ");
migrationBuilder.AlterColumn<DateTime>(
name: "AnnouncementDate",
table: "PeriodExams",
type: "datetime(6)",
nullable: true,
comment: "วันประกาศผลสอบ",
oldClrType: typeof(DateTime),
oldType: "datetime(6)",
oldComment: "วันประกาศผลสอบ");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<DateTime>(
name: "RegisterStartDate",
table: "PeriodExams",
type: "datetime(6)",
nullable: false,
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
comment: "วันเริ่มสมัครสอบ",
oldClrType: typeof(DateTime),
oldType: "datetime(6)",
oldNullable: true,
oldComment: "วันเริ่มสมัครสอบ");
migrationBuilder.AlterColumn<DateTime>(
name: "RegisterEndDate",
table: "PeriodExams",
type: "datetime(6)",
nullable: false,
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
comment: "วันสิ้นสุดสมัครสอบ",
oldClrType: typeof(DateTime),
oldType: "datetime(6)",
oldNullable: true,
oldComment: "วันสิ้นสุดสมัครสอบ");
migrationBuilder.AlterColumn<DateTime>(
name: "PaymentStartDate",
table: "PeriodExams",
type: "datetime(6)",
nullable: false,
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
comment: "วันเริ่มชำระเงิน",
oldClrType: typeof(DateTime),
oldType: "datetime(6)",
oldNullable: true,
oldComment: "วันเริ่มชำระเงิน");
migrationBuilder.AlterColumn<DateTime>(
name: "PaymentEndDate",
table: "PeriodExams",
type: "datetime(6)",
nullable: false,
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
comment: "วันสิ้นสุดชำระเงิน",
oldClrType: typeof(DateTime),
oldType: "datetime(6)",
oldNullable: true,
oldComment: "วันสิ้นสุดชำระเงิน");
migrationBuilder.AlterColumn<DateTime>(
name: "ExamDate",
table: "PeriodExams",
type: "datetime(6)",
nullable: false,
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
comment: "วันที่สอบ",
oldClrType: typeof(DateTime),
oldType: "datetime(6)",
oldNullable: true,
oldComment: "วันที่สอบ");
migrationBuilder.AlterColumn<DateTime>(
name: "AnnouncementDate",
table: "PeriodExams",
type: "datetime(6)",
nullable: false,
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
comment: "วันประกาศผลสอบ",
oldClrType: typeof(DateTime),
oldType: "datetime(6)",
oldNullable: true,
oldComment: "วันประกาศผลสอบ");
}
}
}

12
Models/PeriodExam.cs
View file

@ -26,19 +26,19 @@ namespace BMA.EHR.Recurit.Exam.Service.Models
[Comment("ค่าธรรมเนียม")]
public float? Fee { get; set; } = 0;
[Required, Column(Order = 1), Comment("วันเริ่มสมัครสอบ")]
[Column(Order = 1), Comment("วันเริ่มสมัครสอบ")]
public DateTime? RegisterStartDate { get; set; }
[Required, Column(Order = 2), Comment("วันสิ้นสุดสมัครสอบ")]
[Column(Order = 2), Comment("วันสิ้นสุดสมัครสอบ")]
public DateTime? RegisterEndDate { get; set; }
[Required, Column(Order = 3), Comment("วันเริ่มชำระเงิน")]
[Column(Order = 3), Comment("วันเริ่มชำระเงิน")]
public DateTime? PaymentStartDate { get; set; }
[Required, Column(Order = 4), Comment("วันสิ้นสุดชำระเงิน")]
[Column(Order = 4), Comment("วันสิ้นสุดชำระเงิน")]
public DateTime? PaymentEndDate { get; set; }
[Required, Column(Order = 5), Comment("วันประกาศผลสอบ")]
[Column(Order = 5), Comment("วันประกาศผลสอบ")]
public DateTime? AnnouncementDate { get; set; }
[Required, Column(Order = 6), Comment("วันเริ่มประกาศ")]
@ -47,7 +47,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Models
[Required, Column(Order = 7), Comment("วันสิ้นสุดประกาศ")]
public DateTime AnnouncementEndDate { get; set; } = DateTime.Now.Date;
[Required, Comment("วันที่สอบ")]
[Comment("วันที่สอบ")]
public DateTime? ExamDate { get; set; }
[Comment("Id รหัสส่วนราชการ")]

73
Services/PeriodExamService.cs
View file

@ -884,17 +884,17 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
// {
list.Add(new RequestImportSeat
{
Number = worksheet.Cells[row, 1].Value != null ? worksheet.Cells[row, 1].Value.ToString() : null,
CitizenId = worksheet.Cells[row, 2].Value != null ? worksheet.Cells[row, 2].Value.ToString() : null,
ExamIdenNumber = worksheet.Cells[row, 3].Value != null ? worksheet.Cells[row, 3].Value.ToString() : null,
SeatNumber = worksheet.Cells[row, 4].Value != null ? worksheet.Cells[row, 4].Value.ToString() : null,
PointTotalB = worksheet.Cells[row, 5].Value != null ? worksheet.Cells[row, 5].Value.ToString() : null,
PointB = worksheet.Cells[row, 6].Value != null ? worksheet.Cells[row, 6].Value.ToString() : null,
ResultB = worksheet.Cells[row, 7].Value != null ? worksheet.Cells[row, 7].Value.ToString() : null,
PointTotalC = worksheet.Cells[row, 8].Value != null ? worksheet.Cells[row, 8].Value.ToString() : null,
PointC = worksheet.Cells[row, 9].Value != null ? worksheet.Cells[row, 9].Value.ToString() : null,
ResultC = worksheet.Cells[row, 10].Value != null ? worksheet.Cells[row, 10].Value.ToString() : null,
Pass = worksheet.Cells[row, 11].Value != null ? (worksheet.Cells[row, 11].Value.ToString()) : null,
Number = worksheet.Cells[row, 2].Value != null ? worksheet.Cells[row, 1].Value.ToString() : null,
CitizenId = worksheet.Cells[row, 3].Value != null ? worksheet.Cells[row, 2].Value.ToString() : null,
ExamIdenNumber = worksheet.Cells[row, 4].Value != null ? worksheet.Cells[row, 3].Value.ToString() : null,
SeatNumber = worksheet.Cells[row, 5].Value != null ? worksheet.Cells[row, 4].Value.ToString() : null,
PointTotalB = worksheet.Cells[row, 6].Value != null ? worksheet.Cells[row, 5].Value.ToString() : null,
PointB = worksheet.Cells[row, 7].Value != null ? worksheet.Cells[row, 6].Value.ToString() : null,
ResultB = worksheet.Cells[row, 8].Value != null ? worksheet.Cells[row, 7].Value.ToString() : null,
PointTotalC = worksheet.Cells[row, 9].Value != null ? worksheet.Cells[row, 8].Value.ToString() : null,
PointC = worksheet.Cells[row, 10].Value != null ? worksheet.Cells[row, 9].Value.ToString() : null,
ResultC = worksheet.Cells[row, 11].Value != null ? worksheet.Cells[row, 10].Value.ToString() : null,
Pass = worksheet.Cells[row, 12].Value != null ? (worksheet.Cells[row, 11].Value.ToString()) : null,
});
// }
}
@ -1062,32 +1062,34 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
summarySheet.TabColor = System.Drawing.Color.Black;
// summarySheet.DefaultRowHeight = 17;
summarySheet.Row(1).Style.Font.Bold = true;
summarySheet.Cells[1, 1].Value = "ลำดับที่สอบได้";
summarySheet.Cells[1, 2].Value = "เลขบัตรประชาชน";
summarySheet.Cells[1, 3].Value = "เลขประจำตัวสอบ";
summarySheet.Cells[1, 4].Value = "เลขที่นั่งสอบ";
summarySheet.Cells[1, 5].Value = "คะแนนเต็มภาค ข";
summarySheet.Cells[1, 6].Value = "คะแนนภาค ข";
summarySheet.Cells[1, 7].Value = "ผลสอบภาค ข";
summarySheet.Cells[1, 8].Value = "คะแนนเต็มภาค ค";
summarySheet.Cells[1, 9].Value = "คะแนนภาค ค";
summarySheet.Cells[1, 10].Value = "ผลสอบภาค ค";
summarySheet.Cells[1, 11].Value = "ผลการสอบ";
summarySheet.Cells[1, 1].Value = "วันเและเวลาที่สมัคร";
summarySheet.Cells[1, 2].Value = "ลำดับที่สอบได้";
summarySheet.Cells[1, 3].Value = "เลขบัตรประชาชน";
summarySheet.Cells[1, 4].Value = "เลขประจำตัวสอบ";
summarySheet.Cells[1, 5].Value = "เลขที่นั่งสอบ";
summarySheet.Cells[1, 6].Value = "คะแนนเต็มภาค ข";
summarySheet.Cells[1, 7].Value = "คะแนนภาค ข";
summarySheet.Cells[1, 8].Value = "ผลสอบภาค ข";
summarySheet.Cells[1, 9].Value = "คะแนนเต็มภาค ค";
summarySheet.Cells[1, 10].Value = "คะแนนภาค ค";
summarySheet.Cells[1, 11].Value = "ผลสอบภาค ค";
summarySheet.Cells[1, 12].Value = "ผลการสอบ";
int row = 2;
foreach (var item in candidates)
{
summarySheet.Cells[row, 1].Value = item.Number;
summarySheet.Cells[row, 2].Value = item.CitizenId;
summarySheet.Cells[row, 3].Value = item.ExamIdenNumber;
summarySheet.Cells[row, 4].Value = item.SeatNumber;
summarySheet.Cells[row, 5].Value = item.PointTotalB;
summarySheet.Cells[row, 6].Value = item.PointB;
summarySheet.Cells[row, 7].Value = item.ResultB;
summarySheet.Cells[row, 8].Value = item.PointTotalC;
summarySheet.Cells[row, 9].Value = item.PointC;
summarySheet.Cells[row, 10].Value = item.ResultC;
summarySheet.Cells[row, 11].Value = item.Pass;
summarySheet.Cells[row, 1].Value = item.RegisterDate;
summarySheet.Cells[row, 2].Value = item.Number;
summarySheet.Cells[row, 3].Value = item.CitizenId;
summarySheet.Cells[row, 4].Value = item.ExamIdenNumber;
summarySheet.Cells[row, 5].Value = item.SeatNumber;
summarySheet.Cells[row, 6].Value = item.PointTotalB;
summarySheet.Cells[row, 7].Value = item.PointB;
summarySheet.Cells[row, 8].Value = item.ResultB;
summarySheet.Cells[row, 9].Value = item.PointTotalC;
summarySheet.Cells[row, 10].Value = item.PointC;
summarySheet.Cells[row, 11].Value = item.ResultC;
summarySheet.Cells[row, 12].Value = item.Pass;
row++;
}
summarySheet.Cells[summarySheet.Dimension.Address].AutoFitColumns();
@ -1230,6 +1232,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
OccupationDepartment = c.OccupationDepartment,
OccupationEmail = c.OccupationEmail,
OccupationTelephone = c.OccupationTelephone,
RegisterDate = c.RegisterDate,
Number = c.Number,
ExamIdenNumber = c.ExamIdenNumber,
@ -1305,6 +1308,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
summarySheet.Cells[1, 51].Value = "ผลสอบภาค ค";
summarySheet.Cells[1, 52].Value = "ผลการสอบ";
summarySheet.Cells[1, 53].Value = "วันที่สมัคร";
summarySheet.Cells[1, 54].Value = "วันเและเวลาที่สมัคร";
int row = 2;
foreach (var item in candidates)
@ -1364,6 +1368,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
summarySheet.Cells[row, 51].Value = item.ResultC;
summarySheet.Cells[row, 52].Value = item.Pass;
summarySheet.Cells[row, 53].Value = item.CreatedAt.Date.ToThaiShortDate();
summarySheet.Cells[row, 54].Value = item.RegisterDate;
row++;
}
var careers = await _context.Careers
@ -1421,6 +1426,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
summarySheet.Cells[row, 51].Value = item.ResultC;
summarySheet.Cells[row, 52].Value = item.Pass;
summarySheet.Cells[row, 53].Value = item.CreatedAt.Date.ToThaiShortDate();
summarySheet.Cells[row, 54].Value = item.RegisterDate;
row++;
}
if (educations.Count() == 0 && careers.Count() == 0)
@ -1467,6 +1473,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
summarySheet.Cells[row, 51].Value = item.ResultC;
summarySheet.Cells[row, 52].Value = item.Pass;
summarySheet.Cells[row, 53].Value = item.CreatedAt.Date.ToThaiShortDate();
summarySheet.Cells[row, 54].Value = item.RegisterDate;
row++;
}
}

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

File diff suppressed because it is too large Load diff