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

design report แนวนอน

Browse source
This commit is contained in:
Kittapath 2023-10-09 15:45:40 +07:00
parent 786334d8bb
commit 4a383f251b
9 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
View file

@ -95,7 +95,9 @@ namespace BMA.EHR.Application.Repositories.Commands
Salary = p.Amount == null ? "0" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber().ToThaiNumber(),
AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber(),
ExamNumber = p.ExamNumber == null ? "0" : p.ExamNumber.Value.ToString().ToThaiNumber(),
PlacementName = $"{p.Placement.Name.ToThaiNumber()} ครั้งที่ {p.Placement.Round.ToThaiNumber()}/{p.Placement.Year.ToThaiYear().ToString().ToThaiNumber()}"
PlacementName = $"{p.Placement.Name.ToThaiNumber()} ครั้งที่ {p.Placement.Round.ToThaiNumber()}/{p.Placement.Year.ToThaiYear().ToString().ToThaiNumber()}",
RemarkHorizontal = p.RemarkHorizontal,
RemarkVertical = p.RemarkVertical,
}).ToList();
return report_data;
@ -147,7 +149,9 @@ namespace BMA.EHR.Application.Repositories.Commands
Salary = p.Amount == null ? "" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber(),
ExamNumber = p.ExamNumber == null ? "" : p.ExamNumber.Value.ToString().ToThaiNumber(),
PlacementName = $"{p.Placement.Name.ToThaiNumber()} ครั้งที่ {p.Placement.Round.ToThaiNumber()}/{p.Placement.Year.ToThaiYear().ToString().ToThaiNumber()}"
PlacementName = $"{p.Placement.Name.ToThaiNumber()} ครั้งที่ {p.Placement.Round.ToThaiNumber()}/{p.Placement.Year.ToThaiYear().ToString().ToThaiNumber()}",
RemarkHorizontal = p.RemarkHorizontal,
RemarkVertical = p.RemarkVertical,
}).ToList();
return report_data;
@ -208,7 +212,9 @@ namespace BMA.EHR.Application.Repositories.Commands
NewPositionType = p.PositionType == null ? "" : p.PositionType.Name,
NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name.ToThaiNumber(),
NewSalary = p.Amount == null ? "" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber()
AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber(),
RemarkHorizontal = p.RemarkHorizontal,
RemarkVertical = p.RemarkVertical,
})
.ToList();

4
BMA.EHR.Application/Responses/Reports/CommandType01Response.cs
View file

@ -22,10 +22,12 @@
public string ExamNumber { get; set; } = "0";
public string PlacementName { get; set;} = string.Empty;
public string PlacementName { get; set; } = string.Empty;
public string Seq { get; set; } = string.Empty;
public string Education { get; set; } = string.Empty;
public string? RemarkHorizontal { get; set; } = string.Empty;
public string? RemarkVertical { get; set; } = string.Empty;
}
}

2
BMA.EHR.Application/Responses/Reports/CommandType03Response.cs
View file

@ -41,5 +41,7 @@ namespace BMA.EHR.Application.Responses.Reports
public string? LeaveDate { get; set; } = string.Empty;
public string? MilitaryDate { get; set; } = string.Empty;
public string? OldSalaryDate { get; set; } = string.Empty;
public string? RemarkHorizontal { get; set; } = string.Empty;
public string? RemarkVertical { get; set; } = string.Empty;
}
}