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

ปรับแบบรายงานการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ (18) #1
Some checks failed
release-dev / release-dev (push) Has been cancelled
Details

Browse source
This commit is contained in:
Bright 2025-01-21 18:10:31 +07:00
parent 5380dad68e
commit 50b3dde54e
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs
View file

@ -952,7 +952,7 @@ namespace BMA.EHR.Application.Repositories.Reports
CommanderPosition = string.IsNullOrEmpty(evaluate_assign.result.commander.Position) ? string.Empty : evaluate_assign.result.commander.Position,
CommanderDate = string.IsNullOrEmpty(evaluate_assign.result.evaluate.director1_dated.ToString()) ? "-" : evaluate_assign.result.evaluate.director1_dated.ToThaiFullDate().ToString().ToThaiNumber(),
Name = evaluate_assign.result.experimentee.name,
RoundNo = evaluate_assign.result.assign.round_no.ToString().ToThaiNumber(),
RoundNo = no.ToString().ToThaiNumber(),
DateStart = evaluate_assign.result.assign.date_start != string.Empty ? dateStart_ : "-",
DateFinish = evaluate_assign.result.assign.date_finish != string.Empty ? dateFinish_ : "-",
Develop1 = developComplete1,

4
BMA.EHR.Report.Service/Controllers/ProbationReportController.cs
View file

@ -1131,10 +1131,10 @@ namespace BMA.EHR.Report.Service.Controllers
//ReportProcessor reportProcessor = new ReportProcessor(_configuration);
//RenderingResult result = reportProcessor.RenderReport($"{exportType}", instanceReportSource, deviceInfo);
//return File(result.DocumentBytes, mimeType, $"แบบรายงานการประเมินผล.{exportType.Trim().ToLower()}");
var ExpandMonth = evaluateAssign.GetType().GetProperty("ExpandMonth").GetValue(evaluateAssign).ToString();
var data = new
{
template = ExpandMonth == "๐" ? "probation-18-1" : "probation-18-2",
template = no == 1 ? "probation-18-1" : "probation-18-2",
reportName = "docx-report",
data = evaluateAssign
};