diff --git a/Controllers/DisableController.cs b/Controllers/DisableController.cs index 794d70a..aa12e16 100644 --- a/Controllers/DisableController.cs +++ b/Controllers/DisableController.cs @@ -1281,18 +1281,18 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers r.LastName = workSheet?.Cells[row, 8]?.GetValue() ?? ""; r.Gendor = workSheet?.Cells[row, 98]?.GetValue() ?? ""; r.National = workSheet?.Cells[row, 9]?.GetValue() ?? ""; - r.Race = workSheet?.Cells[row, 9999]?.GetValue() ?? ""; + r.Race = "";//workSheet?.Cells[row, 9999]?.GetValue() ?? ""; r.Religion = workSheet?.Cells[row, 10]?.GetValue() ?? ""; r.DateOfBirth = !string.IsNullOrWhiteSpace(workSheet?.Cells[row, 11]?.GetValue()) ? _disableService.CheckDateTime(workSheet?.Cells[row, 11]?.GetValue() ?? "", "dd/MM/yyyy") : DateTime.MinValue; r.CitizenId = workSheet?.Cells[row, 12]?.GetValue() ?? ""; r.typeTest = workSheet?.Cells[row, 13]?.GetValue() ?? ""; - r.Marry = workSheet?.Cells[row, 9999]?.GetValue() ?? ""; + r.Marry = "";//workSheet?.Cells[row, 9999]?.GetValue() ?? ""; r.Isspecial = "N"; - r.CitizenCardIssuer = workSheet?.Cells[row, 9999]?.GetValue() ?? ""; - r.CitizenCardExpireDate = Convert.ToDateTime(workSheet?.Cells[row, 9999]?.GetValue().ToDateTime(DateTimeFormat.Ymd, "-")); + r.CitizenCardIssuer = "";//workSheet?.Cells[row, 9999]?.GetValue() ?? ""; + r.CitizenCardExpireDate = DateTime.MinValue;//Convert.ToDateTime(workSheet?.Cells[row, 9999]?.GetValue().ToDateTime(DateTimeFormat.Ymd, "-")); r.ApplyDate = !string.IsNullOrWhiteSpace(workSheet?.Cells[row, 87]?.GetValue()) ? _disableService.CheckDateTime(workSheet?.Cells[row, 87]?.GetValue() ?? "", "dd/MM/yyyy") : DateTime.MinValue; - r.PositionType = workSheet?.Cells[row, 9999]?.GetValue() ?? ""; - r.PositionLevel = workSheet?.Cells[row, 9999]?.GetValue() ?? ""; + r.PositionType = "";//workSheet?.Cells[row, 9999]?.GetValue() ?? ""; + r.PositionLevel = "";//workSheet?.Cells[row, 9999]?.GetValue() ?? ""; r.CreatedAt = DateTime.Now; r.CreatedUserId = UserId ?? ""; @@ -1306,11 +1306,11 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers { Degree = workSheet?.Cells[row, 18]?.GetValue() ?? "", Major = workSheet?.Cells[row, 19]?.GetValue() == "อื่น ๆ" ? workSheet?.Cells[row, 20]?.GetValue() ?? "" : workSheet?.Cells[row, 19]?.GetValue() ?? "", - MajorGroupId = workSheet?.Cells[row, 9999]?.GetValue() ?? "", - MajorGroupName = workSheet?.Cells[row, 9999]?.GetValue() ?? "", + MajorGroupId = "",//workSheet?.Cells[row, 9999]?.GetValue() ?? "", + MajorGroupName = "",//workSheet?.Cells[row, 9999]?.GetValue() ?? "", University = workSheet?.Cells[row, 21]?.GetValue() == "อื่น ๆ" ? workSheet?.Cells[row, 22]?.GetValue() ?? "" : workSheet?.Cells[row, 21]?.GetValue() ?? "", GPA = (double)workSheet?.Cells[row, 26]?.GetValue(), - Specialist = workSheet?.Cells[row, 9999]?.GetValue() ?? "", + Specialist = "",//workSheet?.Cells[row, 9999]?.GetValue() ?? "", HighDegree = workSheet?.Cells[row, 27]?.GetValue() ?? "", BachelorDate = !string.IsNullOrWhiteSpace(workSheet?.Cells[row, 25]?.GetValue()) ? _disableService.CheckDateTime(workSheet?.Cells[row, 11]?.GetValue() ?? "", "dd/MM/yyyy") : DateTime.MinValue, CreatedAt = DateTime.Now, @@ -1327,8 +1327,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers Occupation = workSheet?.Cells[row, 33]?.GetValue() == "อื่น ๆ" ? workSheet?.Cells[row, 34]?.GetValue() ?? "" : workSheet?.Cells[row, 33]?.GetValue() ?? "", Position = workSheet?.Cells[row, 37]?.GetValue() ?? "", Workplace = $"{(workSheet?.Cells[row, 36]?.GetValue() ?? "")} {(workSheet?.Cells[row, 35]?.GetValue() ?? "")}", - Telephone = workSheet?.Cells[row, 9999]?.GetValue() ?? "", - WorkAge = workSheet?.Cells[row, 9999]?.GetValue() ?? "", + Telephone = "",//workSheet?.Cells[row, 9999]?.GetValue() ?? "", + WorkAge = "",//workSheet?.Cells[row, 9999]?.GetValue() ?? "", CreatedAt = DateTime.Now, CreatedUserId = UserId ?? "", CreatedFullName = FullName ?? "System Administrator", @@ -1349,7 +1349,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers Province = workSheet?.Cells[row, 56]?.GetValue() ?? "", ZipCode = workSheet?.Cells[row, 57]?.GetValue() ?? "", Telephone = workSheet?.Cells[row, 58]?.GetValue() ?? "", - Mobile = workSheet?.Cells[row, 9999]?.GetValue() ?? "", + Mobile = "",//workSheet?.Cells[row, 9999]?.GetValue() ?? "", Address1 = $"{(workSheet?.Cells[row, 61]?.GetValue() ?? "")} {(workSheet?.Cells[row, 62]?.GetValue() ?? "")}", Moo1 = workSheet?.Cells[row, 63]?.GetValue() ?? "", Soi1 = workSheet?.Cells[row, 64]?.GetValue() ?? "", @@ -1396,10 +1396,10 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers // certificate r.Certificates.Add(new DisableCertificate() { - CertificateNo = workSheet?.Cells[row, 9999]?.GetValue() ?? "", - Description = workSheet?.Cells[row, 9999]?.GetValue() ?? "", - IssueDate = Convert.ToDateTime(workSheet?.Cells[row, 9999]?.GetValue().ToDateTime(DateTimeFormat.Ymd, "-")), - ExpiredDate = Convert.ToDateTime(workSheet?.Cells[row, 9999]?.GetValue().ToDateTime(DateTimeFormat.Ymd, "-")), + CertificateNo = "",//workSheet?.Cells[row, 9999]?.GetValue() ?? "", + Description = "",//workSheet?.Cells[row, 9999]?.GetValue() ?? "", + IssueDate = DateTime.MinValue,//Convert.ToDateTime(workSheet?.Cells[row, 9999]?.GetValue().ToDateTime(DateTimeFormat.Ymd, "-")), + ExpiredDate = DateTime.MinValue,//Convert.ToDateTime(workSheet?.Cells[row, 9999]?.GetValue().ToDateTime(DateTimeFormat.Ymd, "-")), CreatedAt = DateTime.Now, CreatedUserId = UserId ?? "", CreatedFullName = FullName ?? "System Administrator", @@ -1661,9 +1661,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers imported.Scores.Add(r); } - + row++; - + } // end of sheet loop } // end of all file loop } @@ -2028,7 +2028,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers CertificateNo = p.Certificates.Count > 0 ? p.Certificates.First().CertificateNo ?? "" : "", - CertificateIssueDate = p.Certificates.Count > 0 + CertificateIssueDate = p.Certificates.Count > 0 ? p.Certificates.First().IssueDate != DateTime.MinValue ? p.Certificates.First().IssueDate.ToThaiShortDate() : "" @@ -2334,7 +2334,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers Major = p.Educations.First().Major, University = p.Educations.First().University, PositionName = p.PositionName, - ExamName = $"{p.PeriodExam!.Name} ครั้งที่ {p.PeriodExam.Round}/{(p.PeriodExam.Year > 2500 ? p.PeriodExam.Year : (p.PeriodExam.Year+543))}".ToThaiNumber(), + ExamName = $"{p.PeriodExam!.Name} ครั้งที่ {p.PeriodExam.Round}/{(p.PeriodExam.Year > 2500 ? p.PeriodExam.Year : (p.PeriodExam.Year + 543))}".ToThaiNumber(), ExamCount = _disableService.GetExamCount(p.CitizenId).ToString().ToThaiNumber(), type = p.typeTest == "bangkok" ? "กทม." : p.typeTest == "ocsc" ? "ก.พ." : "",