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-10-04 09:46:08 +07:00
parent 974211893a
commit 60eee3711d
9 changed files with 6161 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Data/Migrations/ApplicationDbContextModelSnapshot.cs
View file

@ -943,7 +943,6 @@ namespace BMA.EHR.Recurit.Exam.Service.Data.Migrations
.HasComment("ระยะเวลาเริ่ม");
b.Property<string>("Group")
.IsRequired()
.HasColumnType("longtext")
.HasColumnOrder(4)
.HasComment("กลุ่ม/ฝ่าย");
@ -973,13 +972,11 @@ namespace BMA.EHR.Recurit.Exam.Service.Data.Migrations
.HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
b.Property<string>("Org")
.IsRequired()
.HasColumnType("longtext")
.HasColumnOrder(6)
.HasComment("สังกัด");
b.Property<string>("Pile")
.IsRequired()
.HasColumnType("longtext")
.HasColumnOrder(5)
.HasComment("กอง");
@ -996,6 +993,12 @@ namespace BMA.EHR.Recurit.Exam.Service.Data.Migrations
.HasColumnOrder(7)
.HasComment("ระยะเวลา");
b.Property<string>("Type")
.IsRequired()
.HasColumnType("longtext")
.HasColumnOrder(8)
.HasComment("ประเภท");
b.HasKey("Id");
b.HasIndex("CandidateId");

2963
Migrations/20231003144238_Update Table Careers add type.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

30
Migrations/20231003144238_Update Table Careers add type.cs Normal file
View file

@ -0,0 +1,30 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Recurit.Exam.Service.Migrations
{
/// <inheritdoc />
public partial class UpdateTableCareersaddtype : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "Type",
table: "Careers",
type: "longtext",
nullable: false,
comment: "ประเภท")
.Annotation("MySql:CharSet", "utf8mb4");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "Type",
table: "Careers");
}
}
}

2960
Migrations/20231003152125_Update Table Careers add type1.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

114
Migrations/20231003152125_Update Table Careers add type1.cs Normal file
View file

@ -0,0 +1,114 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Recurit.Exam.Service.Migrations
{
/// <inheritdoc />
public partial class UpdateTableCareersaddtype1 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "Pile",
table: "Careers",
type: "longtext",
nullable: true,
comment: "กอง",
oldClrType: typeof(string),
oldType: "longtext",
oldComment: "กอง")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "Org",
table: "Careers",
type: "longtext",
nullable: true,
comment: "สังกัด",
oldClrType: typeof(string),
oldType: "longtext",
oldComment: "สังกัด")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "Group",
table: "Careers",
type: "longtext",
nullable: true,
comment: "กลุ่ม/ฝ่าย",
oldClrType: typeof(string),
oldType: "longtext",
oldComment: "กลุ่ม/ฝ่าย")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.UpdateData(
table: "Careers",
keyColumn: "Pile",
keyValue: null,
column: "Pile",
value: "");
migrationBuilder.AlterColumn<string>(
name: "Pile",
table: "Careers",
type: "longtext",
nullable: false,
comment: "กอง",
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true,
oldComment: "กอง")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "Careers",
keyColumn: "Org",
keyValue: null,
column: "Org",
value: "");
migrationBuilder.AlterColumn<string>(
name: "Org",
table: "Careers",
type: "longtext",
nullable: false,
comment: "สังกัด",
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true,
oldComment: "สังกัด")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "Careers",
keyColumn: "Group",
keyValue: null,
column: "Group",
value: "");
migrationBuilder.AlterColumn<string>(
name: "Group",
table: "Careers",
type: "longtext",
nullable: false,
comment: "กลุ่ม/ฝ่าย",
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true,
oldComment: "กลุ่ม/ฝ่าย")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
}
}
}

17
Models/Career.cs
View file

@ -6,20 +6,20 @@ namespace BMA.EHR.Recurit.Exam.Service.Models
{
public class Career : EntityBase
{
[Required, Column(Order = 8), Comment("Id ผู้สมัคร")]
[Required, Column(Order = 9), Comment("Id ผู้สมัคร")]
public virtual Candidate? Candidate { get; set; }
[Required, Column(Order = 3), Comment("ชื่อตำแหน่ง")]
public string Position { get; set; } = string.Empty;
[Required, Column(Order = 4), Comment("กลุ่ม/ฝ่าย")]
public string Group { get; set; } = string.Empty;
[Column(Order = 4), Comment("กลุ่ม/ฝ่าย")]
public string? Group { get; set; } = string.Empty;
[Required, Column(Order = 5), Comment("กอง")]
public string Pile { get; set; } = string.Empty;
[Column(Order = 5), Comment("กอง")]
public string? Pile { get; set; } = string.Empty;
[Required, Column(Order = 6), Comment("สังกัด")]
public string Org { get; set; } = string.Empty;
[Column(Order = 6), Comment("สังกัด")]
public string? Org { get; set; } = string.Empty;
[Required, Column(Order = 1), Comment("ระยะเวลาเริ่ม")]
public DateTime DurationStart { get; set; } = DateTime.Now.Date;
@ -29,5 +29,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Models
[Required, Column(Order = 7), Comment("ระยะเวลา")]
public string RangeDate { get; set; } = string.Empty;
[Required, Column(Order = 8), Comment("ประเภท")]
public string Type { get; set; } = string.Empty;
}
}

7
Response/CandidateCareerResponseItem.cs
View file

@ -4,9 +4,10 @@ namespace BMA.EHR.Recurit.Exam.Service.Response
public class CandidateCareerResponseItem
{
public string Position { get; set; } = string.Empty;
public string Group { get; set; } = string.Empty;
public string Pile { get; set; } = string.Empty;
public string Org { get; set; } = string.Empty;
public string? Group { get; set; } = string.Empty;
public string? Pile { get; set; } = string.Empty;
public string? Org { get; set; } = string.Empty;
public string Type { get; set; } = string.Empty;
public DateTime DurationStart { get; set; } = DateTime.Now.Date;
public DateTime DurationEnd { get; set; } = DateTime.Now.Date;
public string RangeDate { get; set; } = string.Empty;

3
Services/CandidateService.cs
View file

@ -1452,6 +1452,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
DurationStart = updated.DurationStart,
DurationEnd = updated.DurationEnd,
RangeDate = updated.RangeDate,
Type = updated.Type,
CreatedAt = DateTime.Now,
CreatedUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now,
@ -1479,6 +1480,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
DurationStart = updated.DurationStart,
DurationEnd = updated.DurationEnd,
RangeDate = updated.RangeDate,
Type = updated.Type,
CreatedAt = DateTime.Now,
CreatedUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now,
@ -1634,6 +1636,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
career.DurationStart = updated.DurationStart;
career.DurationEnd = updated.DurationEnd;
career.RangeDate = updated.RangeDate;
career.Type = updated.Type;
career.LastUpdatedAt = DateTime.Now;
career.LastUpdateUserId = UserId ?? "";
career.LastUpdateFullName = FullName ?? "";

144
Services/PeriodExamService.cs
View file

@ -1445,29 +1445,27 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
summarySheet.Cells[1, 35].Value = "คะแนนเฉลี่ยสะสม";
summarySheet.Cells[1, 36].Value = "วุฒิการศึกษาสูงสุด";
summarySheet.Cells[1, 37].Value = "ตำแหน่งปัจจุบัน ชื่อตำแหน่ง";
summarySheet.Cells[1, 38].Value = "ตำแหน่งปัจจุบัน กอง";
summarySheet.Cells[1, 39].Value = "ตำแหน่งปัจจุบัน กลุ่ม/ฝ่าย";
summarySheet.Cells[1, 40].Value = "ตำแหน่งปัจจุบัน เงินเดือน";
summarySheet.Cells[1, 41].Value = "ตำแหน่งปัจจุบัน สังกัด";
summarySheet.Cells[1, 42].Value = "ตำแหน่งปัจจุบัน ประเภทราชการ";
summarySheet.Cells[1, 43].Value = "เบอร์โทรที่ทำงาน";
summarySheet.Cells[1, 37].Value = "ประวัติการทำงาน ชื่อตำแหน่ง";
summarySheet.Cells[1, 38].Value = "ประวัติการทำงาน ประเภท";
summarySheet.Cells[1, 39].Value = "ประวัติการทำงาน เริ่ม";
summarySheet.Cells[1, 40].Value = "ประวัติการทำงาน สิ้นสุด";
summarySheet.Cells[1, 41].Value = "ประวัติการทำงาน ระยะเวลา";
summarySheet.Cells[1, 44].Value = "ลำดับที่สอบได้";
summarySheet.Cells[1, 45].Value = "เลขประจำตัวสอบ";
summarySheet.Cells[1, 46].Value = "เลขที่นั่งสอบ";
summarySheet.Cells[1, 47].Value = "คะแนนเต็มภาค ก";
summarySheet.Cells[1, 48].Value = "คะแนนภาค ก";
summarySheet.Cells[1, 49].Value = "ผลสอบภาค ก";
summarySheet.Cells[1, 50].Value = "คะแนนเต็มภาค ข";
summarySheet.Cells[1, 51].Value = "คะแนนภาค ข";
summarySheet.Cells[1, 52].Value = "ผลสอบภาค ข";
summarySheet.Cells[1, 53].Value = "คะแนนเต็มภาค ค";
summarySheet.Cells[1, 54].Value = "คะแนนภาค ค";
summarySheet.Cells[1, 55].Value = "ผลสอบภาค ค";
summarySheet.Cells[1, 56].Value = "ผลการสอบ";
summarySheet.Cells[1, 57].Value = "วันที่สมัคร";
summarySheet.Cells[1, 58].Value = "วันเและเวลาที่สมัคร";
summarySheet.Cells[1, 42].Value = "ลำดับที่สอบได้";
summarySheet.Cells[1, 43].Value = "เลขประจำตัวสอบ";
summarySheet.Cells[1, 44].Value = "เลขที่นั่งสอบ";
summarySheet.Cells[1, 45].Value = "คะแนนเต็มภาค ก";
summarySheet.Cells[1, 46].Value = "คะแนนภาค ก";
summarySheet.Cells[1, 47].Value = "ผลสอบภาค ก";
summarySheet.Cells[1, 48].Value = "คะแนนเต็มภาค ข";
summarySheet.Cells[1, 49].Value = "คะแนนภาค ข";
summarySheet.Cells[1, 50].Value = "ผลสอบภาค ข";
summarySheet.Cells[1, 51].Value = "คะแนนเต็มภาค ค";
summarySheet.Cells[1, 52].Value = "คะแนนภาค ค";
summarySheet.Cells[1, 53].Value = "ผลสอบภาค ค";
summarySheet.Cells[1, 54].Value = "ผลการสอบ";
summarySheet.Cells[1, 55].Value = "วันที่สมัคร";
summarySheet.Cells[1, 56].Value = "วันเและเวลาที่สมัคร";
int row = 2;
foreach (var item in candidates)
@ -1519,21 +1517,21 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
summarySheet.Cells[row, 35].Value = education.EducationScores;
summarySheet.Cells[row, 36].Value = education.EducationLevelHighName;
summarySheet.Cells[row, 44].Value = item.Number;
summarySheet.Cells[row, 45].Value = item.ExamIdenNumber;
summarySheet.Cells[row, 46].Value = item.SeatNumber;
summarySheet.Cells[row, 47].Value = item.PointTotalA;
summarySheet.Cells[row, 48].Value = item.PointA;
summarySheet.Cells[row, 49].Value = item.ResultA;
summarySheet.Cells[row, 50].Value = item.PointTotalB;
summarySheet.Cells[row, 51].Value = item.PointB;
summarySheet.Cells[row, 52].Value = item.ResultB;
summarySheet.Cells[row, 53].Value = item.PointTotalC;
summarySheet.Cells[row, 54].Value = item.PointC;
summarySheet.Cells[row, 55].Value = item.ResultC;
summarySheet.Cells[row, 56].Value = item.Pass;
summarySheet.Cells[row, 57].Value = item.CreatedAt.Date.ToThaiShortDate();
summarySheet.Cells[row, 58].Value = item.RegisterDate;
summarySheet.Cells[row, 42].Value = item.Number;
summarySheet.Cells[row, 43].Value = item.ExamIdenNumber;
summarySheet.Cells[row, 44].Value = item.SeatNumber;
summarySheet.Cells[row, 45].Value = item.PointTotalA;
summarySheet.Cells[row, 46].Value = item.PointA;
summarySheet.Cells[row, 47].Value = item.ResultA;
summarySheet.Cells[row, 48].Value = item.PointTotalB;
summarySheet.Cells[row, 49].Value = item.PointB;
summarySheet.Cells[row, 50].Value = item.ResultB;
summarySheet.Cells[row, 51].Value = item.PointTotalC;
summarySheet.Cells[row, 52].Value = item.PointC;
summarySheet.Cells[row, 53].Value = item.ResultC;
summarySheet.Cells[row, 54].Value = item.Pass;
summarySheet.Cells[row, 55].Value = item.CreatedAt.Date.ToThaiShortDate();
summarySheet.Cells[row, 56].Value = item.RegisterDate;
row++;
}
var careers = await _context.Careers
@ -1575,28 +1573,28 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
summarySheet.Cells[row, 28].Value = item.OccupationTelephone;
summarySheet.Cells[row, 37].Value = career.Position;
summarySheet.Cells[row, 38].Value = career.Group;
summarySheet.Cells[row, 39].Value = career.Pile;
summarySheet.Cells[row, 40].Value = career.Org;
summarySheet.Cells[row, 41].Value = career.DurationStart == null ? "-" : career.DurationStart.Date.ToThaiShortDate();
summarySheet.Cells[row, 42].Value = career.DurationEnd == null ? "-" : career.DurationEnd.Date.ToThaiShortDate();
summarySheet.Cells[row, 43].Value = career.RangeDate;
summarySheet.Cells[row, 38].Value = career.Type;
// summarySheet.Cells[row, 39].Value = career.Pile;
// summarySheet.Cells[row, 40].Value = career.Org;
summarySheet.Cells[row, 39].Value = career.DurationStart == null ? "-" : career.DurationStart.Date.ToThaiShortDate();
summarySheet.Cells[row, 40].Value = career.DurationEnd == null ? "-" : career.DurationEnd.Date.ToThaiShortDate();
summarySheet.Cells[row, 41].Value = career.RangeDate;
summarySheet.Cells[row, 44].Value = item.Number;
summarySheet.Cells[row, 45].Value = item.ExamIdenNumber;
summarySheet.Cells[row, 46].Value = item.SeatNumber;
summarySheet.Cells[row, 47].Value = item.PointTotalA;
summarySheet.Cells[row, 48].Value = item.PointA;
summarySheet.Cells[row, 49].Value = item.ResultA;
summarySheet.Cells[row, 50].Value = item.PointTotalB;
summarySheet.Cells[row, 51].Value = item.PointB;
summarySheet.Cells[row, 52].Value = item.ResultB;
summarySheet.Cells[row, 53].Value = item.PointTotalC;
summarySheet.Cells[row, 54].Value = item.PointC;
summarySheet.Cells[row, 55].Value = item.ResultC;
summarySheet.Cells[row, 56].Value = item.Pass;
summarySheet.Cells[row, 57].Value = item.CreatedAt.Date.ToThaiShortDate();
summarySheet.Cells[row, 58].Value = item.RegisterDate;
summarySheet.Cells[row, 42].Value = item.Number;
summarySheet.Cells[row, 43].Value = item.ExamIdenNumber;
summarySheet.Cells[row, 44].Value = item.SeatNumber;
summarySheet.Cells[row, 45].Value = item.PointTotalA;
summarySheet.Cells[row, 46].Value = item.PointA;
summarySheet.Cells[row, 47].Value = item.ResultA;
summarySheet.Cells[row, 48].Value = item.PointTotalB;
summarySheet.Cells[row, 49].Value = item.PointB;
summarySheet.Cells[row, 50].Value = item.ResultB;
summarySheet.Cells[row, 51].Value = item.PointTotalC;
summarySheet.Cells[row, 52].Value = item.PointC;
summarySheet.Cells[row, 53].Value = item.ResultC;
summarySheet.Cells[row, 54].Value = item.Pass;
summarySheet.Cells[row, 55].Value = item.CreatedAt.Date.ToThaiShortDate();
summarySheet.Cells[row, 56].Value = item.RegisterDate;
row++;
}
if (educations.Count() == 0 && careers.Count() == 0)
@ -1631,21 +1629,21 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
summarySheet.Cells[row, 27].Value = item.OccupationPositionType == null ? null : GenerateStatusOccupation(item.OccupationPositionType);
summarySheet.Cells[row, 28].Value = item.OccupationTelephone;
summarySheet.Cells[row, 44].Value = item.Number;
summarySheet.Cells[row, 45].Value = item.ExamIdenNumber;
summarySheet.Cells[row, 46].Value = item.SeatNumber;
summarySheet.Cells[row, 47].Value = item.PointTotalA;
summarySheet.Cells[row, 48].Value = item.PointA;
summarySheet.Cells[row, 49].Value = item.ResultA;
summarySheet.Cells[row, 50].Value = item.PointTotalB;
summarySheet.Cells[row, 51].Value = item.PointB;
summarySheet.Cells[row, 52].Value = item.ResultB;
summarySheet.Cells[row, 53].Value = item.PointTotalC;
summarySheet.Cells[row, 54].Value = item.PointC;
summarySheet.Cells[row, 55].Value = item.ResultC;
summarySheet.Cells[row, 56].Value = item.Pass;
summarySheet.Cells[row, 57].Value = item.CreatedAt.Date.ToThaiShortDate();
summarySheet.Cells[row, 58].Value = item.RegisterDate;
summarySheet.Cells[row, 42].Value = item.Number;
summarySheet.Cells[row, 43].Value = item.ExamIdenNumber;
summarySheet.Cells[row, 44].Value = item.SeatNumber;
summarySheet.Cells[row, 45].Value = item.PointTotalA;
summarySheet.Cells[row, 46].Value = item.PointA;
summarySheet.Cells[row, 47].Value = item.ResultA;
summarySheet.Cells[row, 48].Value = item.PointTotalB;
summarySheet.Cells[row, 49].Value = item.PointB;
summarySheet.Cells[row, 50].Value = item.ResultB;
summarySheet.Cells[row, 51].Value = item.PointTotalC;
summarySheet.Cells[row, 52].Value = item.PointC;
summarySheet.Cells[row, 53].Value = item.ResultC;
summarySheet.Cells[row, 54].Value = item.Pass;
summarySheet.Cells[row, 55].Value = item.CreatedAt.Date.ToThaiShortDate();
summarySheet.Cells[row, 56].Value = item.RegisterDate;
row++;
}
}