Merge branch 'Develop-Bright' into develop
# Conflicts: # BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj
This commit is contained in:
commit
3d0fbdceb8
30 changed files with 2041 additions and 124 deletions
|
|
@ -1,8 +1,11 @@
|
|||
using BMA.EHR.Application.Repositories.Reports;
|
||||
using BMA.EHR.Domain.Common;
|
||||
using DocumentFormat.OpenXml.Drawing;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Swashbuckle.AspNetCore.Annotations;
|
||||
using Telerik.Reporting;
|
||||
using Telerik.Reporting.Processing;
|
||||
|
||||
namespace BMA.EHR.Report.Service.Controllers
|
||||
{
|
||||
|
|
@ -55,7 +58,10 @@ namespace BMA.EHR.Report.Service.Controllers
|
|||
try
|
||||
{
|
||||
var data = await _repository.GetKhr1Report(id);
|
||||
return Success(data);
|
||||
var total = await _repository.GetKhr1TotalReport(id);
|
||||
var YearInsignalPeriod = await _repository.GetYearInsigniaPeriod(id);
|
||||
var TwoYearInsignalPeriod = await _repository.Get2YearInsigniaPeriod(id);
|
||||
var Date = await _repository.GetDateInsigniaPeriod(id);
|
||||
var mimeType = "";
|
||||
switch (exportType.Trim().ToLower())
|
||||
{
|
||||
|
|
@ -63,12 +69,53 @@ namespace BMA.EHR.Report.Service.Controllers
|
|||
case "docx": mimeType = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"; break;
|
||||
case "xlsx": mimeType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; break;
|
||||
}
|
||||
|
||||
|
||||
var rptFile = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"39-แบบ ขร1 บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ ข้าราชการ ชั้นสายสะพาย.trdp");
|
||||
var contentData = _reportGenerator.GenerateReport(rptFile, exportType);
|
||||
|
||||
return File(contentData, mimeType, $"insignia.{exportType.Trim().ToLower()}");
|
||||
ReportPackager reportPacker = new ReportPackager();
|
||||
Telerik.Reporting.Report? report = null;
|
||||
using (var sourceStream = System.IO.File.OpenRead(rptFile))
|
||||
{
|
||||
report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream);
|
||||
}
|
||||
|
||||
report.ReportParameters["YearInsigniaPeriod"].Value = YearInsignalPeriod;
|
||||
report.ReportParameters["TwoYearInsignalPeriod"].Value = TwoYearInsignalPeriod;
|
||||
report.ReportParameters["EndDate"].Value = Date.GetType().GetProperty("EndDate").GetValue(Date);
|
||||
|
||||
var _Khr1List = new List<dynamic>();
|
||||
foreach (var _data in data)
|
||||
{
|
||||
_Khr1List.Add(new
|
||||
{
|
||||
RowNo = _data.GetType().GetProperty("RowNo").GetValue(_data),
|
||||
DepartmentName = _data.GetType().GetProperty("DepartmentName").GetValue(_data),
|
||||
G1Male = _data.GetType().GetProperty("G1Male").GetValue(_data),
|
||||
G1Female = _data.GetType().GetProperty("G1Female").GetValue(_data),
|
||||
G2Male = _data.GetType().GetProperty("G2Male").GetValue(_data),
|
||||
G2Female = _data.GetType().GetProperty("G2Female").GetValue(_data),
|
||||
G3Male = _data.GetType().GetProperty("G3Male").GetValue(_data),
|
||||
G3Female = _data.GetType().GetProperty("G3Female").GetValue(_data),
|
||||
G4Male = _data.GetType().GetProperty("G4Male").GetValue(_data),
|
||||
G4Female = _data.GetType().GetProperty("G4Female").GetValue(_data),
|
||||
G5Male = _data.GetType().GetProperty("G5Male").GetValue(_data),
|
||||
G5Female = _data.GetType().GetProperty("G5Female").GetValue(_data),
|
||||
reason = string.Empty,
|
||||
});
|
||||
}
|
||||
var tbl = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"];
|
||||
tbl.DataSource = _Khr1List;
|
||||
var tbl2 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table2"];
|
||||
tbl2.DataSource = total;
|
||||
|
||||
System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
|
||||
InstanceReportSource instanceReportSource = new InstanceReportSource()
|
||||
{
|
||||
ReportDocument = report,
|
||||
};
|
||||
ReportProcessor reportProcessor = new ReportProcessor(_configuration);
|
||||
RenderingResult result = reportProcessor.RenderReport($"{exportType}", instanceReportSource, deviceInfo);
|
||||
return File(result.DocumentBytes, mimeType, $"แบบ ขร1.{exportType.Trim().ToLower()}");
|
||||
}
|
||||
catch
|
||||
{
|
||||
|
|
@ -93,7 +140,10 @@ namespace BMA.EHR.Report.Service.Controllers
|
|||
try
|
||||
{
|
||||
var data = await _repository.GetKhr2Report(id);
|
||||
return Success(data);
|
||||
var total = await _repository.GetKhr2TotalReport(id);
|
||||
var YearInsignalPeriod = await _repository.GetYearInsigniaPeriod(id);
|
||||
var TwoYearInsignalPeriod = await _repository.Get2YearInsigniaPeriod(id);
|
||||
var Date = await _repository.GetDateInsigniaPeriod(id);
|
||||
var mimeType = "";
|
||||
switch (exportType.Trim().ToLower())
|
||||
{
|
||||
|
|
@ -103,10 +153,58 @@ namespace BMA.EHR.Report.Service.Controllers
|
|||
}
|
||||
|
||||
var rptFile = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"40-แบบ ขร2 บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ ข้าราชการ ชั้นต่ำกว่าสายสะพาย.trdp");
|
||||
var contentData = _reportGenerator.GenerateReport(rptFile, exportType);
|
||||
ReportPackager reportPacker = new ReportPackager();
|
||||
Telerik.Reporting.Report? report = null;
|
||||
using (var sourceStream = System.IO.File.OpenRead(rptFile))
|
||||
{
|
||||
report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream);
|
||||
}
|
||||
|
||||
return File(contentData, mimeType, $"insignia.{exportType.Trim().ToLower()}");
|
||||
report.ReportParameters["YearInsigniaPeriod"].Value = YearInsignalPeriod;
|
||||
report.ReportParameters["TwoYearInsignalPeriod"].Value = TwoYearInsignalPeriod;
|
||||
report.ReportParameters["EndDate"].Value = Date.GetType().GetProperty("EndDate").GetValue(Date);
|
||||
|
||||
var _Khr2List = new List<dynamic>();
|
||||
foreach (var _data in data)
|
||||
{
|
||||
_Khr2List.Add(new
|
||||
{
|
||||
//RowNo = _data.GetType().GetProperty("RowNo").GetValue(_data),
|
||||
RowNo = _Khr2List.Count+1,
|
||||
DepartmentName = _data.GetType().GetProperty("DepartmentName").GetValue(_data),
|
||||
G1Male = _data.GetType().GetProperty("G1Male").GetValue(_data),
|
||||
G1Female = _data.GetType().GetProperty("G1Female").GetValue(_data),
|
||||
G2Male = _data.GetType().GetProperty("G2Male").GetValue(_data),
|
||||
G2Female = _data.GetType().GetProperty("G2Female").GetValue(_data),
|
||||
G3Male = _data.GetType().GetProperty("G3Male").GetValue(_data),
|
||||
G3Female = _data.GetType().GetProperty("G3Female").GetValue(_data),
|
||||
G4Male = _data.GetType().GetProperty("G4Male").GetValue(_data),
|
||||
G4Female = _data.GetType().GetProperty("G4Female").GetValue(_data),
|
||||
G5Male = _data.GetType().GetProperty("G5Male").GetValue(_data),
|
||||
G5Female = _data.GetType().GetProperty("G5Female").GetValue(_data),
|
||||
G6Male = _data.GetType().GetProperty("G1Male").GetValue(_data),
|
||||
G6Female = _data.GetType().GetProperty("G1Female").GetValue(_data),
|
||||
G7Male = _data.GetType().GetProperty("G1Male").GetValue(_data),
|
||||
G7Female = _data.GetType().GetProperty("G1Female").GetValue(_data),
|
||||
G8Male = _data.GetType().GetProperty("G1Male").GetValue(_data),
|
||||
G8Female = _data.GetType().GetProperty("G1Female").GetValue(_data),
|
||||
G9Male = _data.GetType().GetProperty("G1Male").GetValue(_data),
|
||||
G9Female = _data.GetType().GetProperty("G1Female").GetValue(_data),
|
||||
});
|
||||
}
|
||||
var tbl1 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"];
|
||||
tbl1.DataSource = _Khr2List;
|
||||
var tbl2 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table2"];
|
||||
tbl2.DataSource = total;
|
||||
|
||||
System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
|
||||
InstanceReportSource instanceReportSource = new InstanceReportSource()
|
||||
{
|
||||
ReportDocument = report,
|
||||
};
|
||||
ReportProcessor reportProcessor = new ReportProcessor(_configuration);
|
||||
RenderingResult result = reportProcessor.RenderReport($"{exportType}", instanceReportSource, deviceInfo);
|
||||
return File(result.DocumentBytes, mimeType, $"แบบ ขร2.{exportType.Trim().ToLower()}");
|
||||
}
|
||||
catch
|
||||
{
|
||||
|
|
@ -131,7 +229,6 @@ namespace BMA.EHR.Report.Service.Controllers
|
|||
try
|
||||
{
|
||||
var data = await _repository.GetKhr3Report(id);
|
||||
return Success(data);
|
||||
var mimeType = "";
|
||||
switch (exportType.Trim().ToLower())
|
||||
{
|
||||
|
|
@ -143,7 +240,7 @@ namespace BMA.EHR.Report.Service.Controllers
|
|||
var rptFile = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"41-แบบ ขร3 บัญชีรายชื่อข้าราชการผู้ขอพระราชทานเครื่องราชฯ.trdp");
|
||||
var contentData = _reportGenerator.GenerateReport(rptFile, exportType);
|
||||
|
||||
return File(contentData, mimeType, $"insignia.{exportType.Trim().ToLower()}");
|
||||
return File(contentData, mimeType, $"แบบ ขร3.{exportType.Trim().ToLower()}");
|
||||
|
||||
}
|
||||
catch
|
||||
|
|
@ -169,7 +266,6 @@ namespace BMA.EHR.Report.Service.Controllers
|
|||
try
|
||||
{
|
||||
var data = await _repository.GetKhr4Report(id);
|
||||
return Success(data);
|
||||
var mimeType = "";
|
||||
switch (exportType.Trim().ToLower())
|
||||
{
|
||||
|
|
@ -179,9 +275,24 @@ namespace BMA.EHR.Report.Service.Controllers
|
|||
}
|
||||
|
||||
var rptFile = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"42-แบบ ขร4 บัญชีแสดงคุณสมบัติของข้าราชการซึ่งเสนอขอเครื่องราชฯ.trdp");
|
||||
var contentData = _reportGenerator.GenerateReport(rptFile, exportType);
|
||||
ReportPackager reportPacker = new ReportPackager();
|
||||
Telerik.Reporting.Report? report = null;
|
||||
using (var sourceStream = System.IO.File.OpenRead(rptFile))
|
||||
{
|
||||
report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream);
|
||||
}
|
||||
|
||||
return File(contentData, mimeType, $"insignia.{exportType.Trim().ToLower()}");
|
||||
var tbl1 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"];
|
||||
tbl1.DataSource = data;
|
||||
|
||||
System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
|
||||
InstanceReportSource instanceReportSource = new InstanceReportSource()
|
||||
{
|
||||
ReportDocument = report,
|
||||
};
|
||||
ReportProcessor reportProcessor = new ReportProcessor(_configuration);
|
||||
RenderingResult result = reportProcessor.RenderReport($"{exportType}", instanceReportSource, deviceInfo);
|
||||
return File(result.DocumentBytes, mimeType, $"แบบ ขร4.{exportType.Trim().ToLower()}");
|
||||
|
||||
}
|
||||
catch
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue