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

แก้โค้ดรายงาน บช 1 ให้เรียงลำดับ

Browse source 
บช 2-3 แสดงรายชื่อ และการเรียงลำดับ
This commit is contained in:
Suphonchai Phoonsawat 2023-06-19 20:35:36 +07:00
parent 23b3bdbbd0
commit 2940777197
6 changed files with 780 additions and 485 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Controllers/OrganizationReportController.cs
View file

@ -108,7 +108,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.GovernmentCode).ThenBy(x => x.PositionNumberInt).ToList();
var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Report", "Organization", $"rptAccount1.trdp");
ReportPackager reportPackager = new ReportPackager();
@ -118,7 +118,7 @@ namespace BMA.EHR.Report.Service.Controllers
report = (Telerik.Reporting.Report)reportPackager.UnpackageDocument(sourceStream);
}
report.DataSource = items;
report.DataSource = result_data;
System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
InstanceReportSource instanceReportSource = new InstanceReportSource()
@ -130,7 +130,7 @@ namespace BMA.EHR.Report.Service.Controllers
ReportProcessor reportProcessor = new ReportProcessor(_configuration);
RenderingResult result = reportProcessor.RenderReport("PDF", instanceReportSource, deviceInfo);
var first_record = items.FirstOrDefault();
var first_record = result_data.FirstOrDefault();
var content = result.DocumentBytes;
return File(content, "application/pdf", $"รายงานบัญชี1_{first_record.RootOcName}_.pdf");
@ -141,17 +141,18 @@ namespace BMA.EHR.Report.Service.Controllers
}
}
/// <summary>
/// รายงานบัญชี 2
/// </summary>
/// <param name="id">รหัสสำนัก</param>
/// <returns></returns>
/// <response code="200">เมื่อแสดงรายงานสำเร็จ</response>
/// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpGet("account2/{id:length(36)}")]
/// <summary>
/// รายงานบัญชี 2
/// </summary>
/// <param name="id">รหัสสำนัก</param>
/// <returns></returns>
/// <response code="200">เมื่อแสดงรายงานสำเร็จ</response>
/// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpGet("account2/{id:length(36)}")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
@ -211,7 +212,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.GovernmentCode).ThenBy(x => x.PositionNumberInt).ToList();
var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Report", "Organization", $"rptAccount2.trdp");
ReportPackager reportPackager = new ReportPackager();
@ -221,7 +222,7 @@ namespace BMA.EHR.Report.Service.Controllers
report = (Telerik.Reporting.Report)reportPackager.UnpackageDocument(sourceStream);
}
report.DataSource = items;
report.DataSource = result_data;
System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
InstanceReportSource instanceReportSource = new InstanceReportSource()
@ -233,7 +234,7 @@ namespace BMA.EHR.Report.Service.Controllers
ReportProcessor reportProcessor = new ReportProcessor(_configuration);
RenderingResult result = reportProcessor.RenderReport("PDF", instanceReportSource, deviceInfo);
var first_record = items.FirstOrDefault();
var first_record = result_data.FirstOrDefault();
var content = result.DocumentBytes;
return File(content, "application/pdf", $"รายงานบัญชี2_{first_record.RootOcName}_.pdf");
@ -315,7 +316,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.GovernmentCode).ThenBy(x => x.PositionNumberInt).ToList();
var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Report", "Organization", $"rptAccount3.trdp");
ReportPackager reportPackager = new ReportPackager();
@ -325,7 +326,7 @@ namespace BMA.EHR.Report.Service.Controllers
report = (Telerik.Reporting.Report)reportPackager.UnpackageDocument(sourceStream);
}
report.DataSource = items;
report.DataSource = result_data;
System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
InstanceReportSource instanceReportSource = new InstanceReportSource()
@ -337,7 +338,7 @@ namespace BMA.EHR.Report.Service.Controllers
ReportProcessor reportProcessor = new ReportProcessor(_configuration);
RenderingResult result = reportProcessor.RenderReport("PDF", instanceReportSource, deviceInfo);
var first_record = items.FirstOrDefault();
var first_record = result_data.FirstOrDefault();
var content = result.DocumentBytes;
return File(content, "application/pdf", $"รายงานบัญชี3_{first_record.RootOcName}_.pdf");