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

sort correct

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-06-22 06:40:30 +07:00
parent bd1ec56e82
commit 1325eb82a6
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Controllers/OrganizationReportController.cs
View file

@ -213,7 +213,7 @@ namespace BMA.EHR.Report.Service.Controllers
}
//var items = result_data.OrderBy(x => x.GovernmentCode).ThenBy(x => x.PositionNumberInt).ToList();
var items = result_data.OrderBy(x => x.OcOrder).ThenBy(x => x.PositionNumberIntNew).ToList();
var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Report", "Organization", $"rptAccount2.trdp");
ReportPackager reportPackager = new ReportPackager();
@ -223,7 +223,7 @@ namespace BMA.EHR.Report.Service.Controllers
report = (Telerik.Reporting.Report)reportPackager.UnpackageDocument(sourceStream);
}
report.DataSource = result_data;
report.DataSource = items;
System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
InstanceReportSource instanceReportSource = new InstanceReportSource()
@ -235,7 +235,7 @@ namespace BMA.EHR.Report.Service.Controllers
ReportProcessor reportProcessor = new ReportProcessor(_configuration);
RenderingResult result = reportProcessor.RenderReport("PDF", instanceReportSource, deviceInfo);
var first_record = result_data.FirstOrDefault();
var first_record = items.FirstOrDefault();
var content = result.DocumentBytes;
return File(content, "application/pdf", $"รายงานบัญชี2_{first_record.RootOcName}_.pdf");
@ -297,7 +297,8 @@ namespace BMA.EHR.Report.Service.Controllers
OcNameNew = d.OcNameNew,
ShortNameNew = d.ShortNameNew,
PositionNumberNew = d.PositionNumberNew == "" ? d.PositionNumber : d.PositionNumberNew,
PositionNumberIntNew = d.PositionNumberNew == "" ? d.PositionNumberInt : d.PositionNumberIntNew,
PositionNumberIntNew = d.PositionNumberNew == "" ? Convert.ToInt32(d.PositionNumber.Split(".").Last()) :
Convert.ToInt32(d.PositionNumberNew.Split(".").Last()),
PositionLevelNew = d.PositionLevelNew == "" ? d.PositionLevel : d.PositionLevelNew,
PositionNameNew = d.PositionNameNew == "" ? d.PositionName : d.PositionNameNew,
PositionSideNew = d.PositionSideNew == "" ? d.PositionSide : d.PositionSideNew,
@ -317,7 +318,7 @@ namespace BMA.EHR.Report.Service.Controllers
}
//var items = result_data.OrderBy(x => x.GovernmentCode).ThenBy(x => x.PositionNumberInt).ToList();
var items = result_data.OrderBy(x => x.OcOrder).ThenBy(x => x.PositionNumberIntNew).ToList();
var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Report", "Organization", $"rptAccount3.trdp");
ReportPackager reportPackager = new ReportPackager();
@ -327,7 +328,7 @@ namespace BMA.EHR.Report.Service.Controllers
report = (Telerik.Reporting.Report)reportPackager.UnpackageDocument(sourceStream);
}
report.DataSource = result_data;
report.DataSource = items;
System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
InstanceReportSource instanceReportSource = new InstanceReportSource()
@ -339,7 +340,7 @@ namespace BMA.EHR.Report.Service.Controllers
ReportProcessor reportProcessor = new ReportProcessor(_configuration);
RenderingResult result = reportProcessor.RenderReport("PDF", instanceReportSource, deviceInfo);
var first_record = result_data.FirstOrDefault();
var first_record = items.FirstOrDefault();
var content = result.DocumentBytes;
return File(content, "application/pdf", $"รายงานบัญชี3_{first_record.RootOcName}_.pdf");