update
This commit is contained in:
@@ -189,7 +189,16 @@ namespace rmutr_report.Controllers
|
|||||||
[ApiExplorerSettings(GroupName = "reports")]
|
[ApiExplorerSettings(GroupName = "reports")]
|
||||||
public IActionResult GetHr2Report([FromRoute] string type, [FromBody] hr_position_manage _hr)
|
public IActionResult GetHr2Report([FromRoute] string type, [FromBody] hr_position_manage _hr)
|
||||||
{
|
{
|
||||||
foreach (var hr in _hr.data)
|
// var sum = _hr.summary.ToArray();
|
||||||
|
// if (sum.GetLength(0)>1)
|
||||||
|
// {
|
||||||
|
// _hr.text = "สรุปจำนวน";
|
||||||
|
// }
|
||||||
|
// else if (sum.GetLength(0)<=1)
|
||||||
|
// {
|
||||||
|
// _hr.text = "";
|
||||||
|
// }
|
||||||
|
foreach (var hr in _hr.data)
|
||||||
{
|
{
|
||||||
if (hr.position_academic_salary != null)
|
if (hr.position_academic_salary != null)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -11,11 +11,11 @@ namespace rmutr_report.Models.Hrregister
|
|||||||
public string status { get; set; }
|
public string status { get; set; }
|
||||||
public string agency_name_th { get; set; }
|
public string agency_name_th { get; set; }
|
||||||
public List<hr_position_manage_detail> data { get; set; }
|
public List<hr_position_manage_detail> data { get; set; }
|
||||||
|
public List<hr_count_position> summary { get; set; }
|
||||||
public string total1 { get; set; }
|
public string total1 { get; set; }
|
||||||
public string total2 { get; set; }
|
public string total2 { get; set; }
|
||||||
public int? professor { get; set; }
|
public string text { get; set; }
|
||||||
public int? associate_rofessor { get; set; }
|
|
||||||
public int? assistant_professor { get; set; }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class hr_position_manage_detail
|
public class hr_position_manage_detail
|
||||||
@@ -36,4 +36,10 @@ namespace rmutr_report.Models.Hrregister
|
|||||||
public string money1 { get; set; }
|
public string money1 { get; set; }
|
||||||
public string money2 { get; set; }
|
public string money2 { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class hr_count_position
|
||||||
|
{
|
||||||
|
public string position_name { get; set; }
|
||||||
|
public int? count_position { get; set; }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="11/06/2022 19:22:18" ReportInfo.CreatorVersion="2022.1.0.0">
|
<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="11/07/2022 18:33:27" ReportInfo.CreatorVersion="2022.1.0.0">
|
||||||
<Dictionary>
|
<Dictionary>
|
||||||
<BusinessObjectDataSource Name="hr_position_manage" ReferenceName="hr_position_manage" DataType="null" Enabled="true">
|
<BusinessObjectDataSource Name="hr_position_manage" ReferenceName="hr_position_manage" DataType="null" Enabled="true">
|
||||||
<Column Name="academic_year_name_th" DataType="System.String"/>
|
<Column Name="academic_year_name_th" DataType="System.String"/>
|
||||||
@@ -7,9 +7,7 @@
|
|||||||
<Column Name="agency_name_th" DataType="System.String"/>
|
<Column Name="agency_name_th" DataType="System.String"/>
|
||||||
<Column Name="total1" DataType="System.String"/>
|
<Column Name="total1" DataType="System.String"/>
|
||||||
<Column Name="total2" DataType="System.String"/>
|
<Column Name="total2" DataType="System.String"/>
|
||||||
<Column Name="professor" DataType="System.Int32"/>
|
<Column Name="text" DataType="System.String"/>
|
||||||
<Column Name="associate_rofessor" DataType="System.Int32"/>
|
|
||||||
<Column Name="assistant_professor" DataType="System.Int32"/>
|
|
||||||
<BusinessObjectDataSource Name="data" DataType="null" Enabled="true">
|
<BusinessObjectDataSource Name="data" DataType="null" Enabled="true">
|
||||||
<Column Name="position_manage_name" DataType="System.String"/>
|
<Column Name="position_manage_name" DataType="System.String"/>
|
||||||
<Column Name="position_manage_salary" DataType="System.Decimal"/>
|
<Column Name="position_manage_salary" DataType="System.Decimal"/>
|
||||||
@@ -23,6 +21,10 @@
|
|||||||
<Column Name="money1" DataType="System.String"/>
|
<Column Name="money1" DataType="System.String"/>
|
||||||
<Column Name="money2" DataType="System.String"/>
|
<Column Name="money2" DataType="System.String"/>
|
||||||
</BusinessObjectDataSource>
|
</BusinessObjectDataSource>
|
||||||
|
<BusinessObjectDataSource Name="summary" DataType="null" Enabled="true">
|
||||||
|
<Column Name="position_name" DataType="System.String"/>
|
||||||
|
<Column Name="count_position" DataType="System.Int32"/>
|
||||||
|
</BusinessObjectDataSource>
|
||||||
</BusinessObjectDataSource>
|
</BusinessObjectDataSource>
|
||||||
</Dictionary>
|
</Dictionary>
|
||||||
<ReportPage Name="Page1" Landscape="true" PaperWidth="500" PaperHeight="210" Watermark.Font="Arial, 60pt">
|
<ReportPage Name="Page1" Landscape="true" PaperWidth="500" PaperHeight="210" Watermark.Font="Arial, 60pt">
|
||||||
@@ -58,8 +60,8 @@
|
|||||||
</TableRow>
|
</TableRow>
|
||||||
</TableObject>
|
</TableObject>
|
||||||
</PageHeaderBand>
|
</PageHeaderBand>
|
||||||
<DataBand Name="Data1" Top="175.73" Width="1814.4">
|
<DataBand Name="Data1" Top="176.07" Width="1814.4">
|
||||||
<DataBand Name="Data2" Top="181.37" Width="1814.4" Height="47.25" DataSource="data">
|
<DataBand Name="Data2" Top="182.04" Width="1814.4" Height="94.5" DataSource="data">
|
||||||
<TableObject Name="Table15" Width="1814.4" Height="47.25" Border.Lines="All">
|
<TableObject Name="Table15" Width="1814.4" Height="47.25" Border.Lines="All">
|
||||||
<TableColumn Name="Column79" Width="245.7"/>
|
<TableColumn Name="Column79" Width="245.7"/>
|
||||||
<TableColumn Name="Column80" Width="132.3"/>
|
<TableColumn Name="Column80" Width="132.3"/>
|
||||||
@@ -82,43 +84,31 @@
|
|||||||
<TableCell Name="Cell147" Border.Lines="All" Text="[hr_position_manage.data.directive]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" VertAlign="Center" Font="TH Sarabun New, 12pt"/>
|
<TableCell Name="Cell147" Border.Lines="All" Text="[hr_position_manage.data.directive]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" VertAlign="Center" Font="TH Sarabun New, 12pt"/>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
</TableObject>
|
</TableObject>
|
||||||
|
<TableObject Name="Table16" Top="47.25" Width="519.75" Height="47.25" Border.Lines="All">
|
||||||
|
<TableColumn Name="Column88" Width="245.7"/>
|
||||||
|
<TableColumn Name="Column89" Width="132.3"/>
|
||||||
|
<TableColumn Name="Column90" Width="141.75"/>
|
||||||
|
<TableRow Name="Row16" Height="47.25">
|
||||||
|
<TableCell Name="Cell148" Text="สรุปจำนวนเงิน" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
||||||
|
<TableCell Name="Cell149" Border.Lines="All" Text="[hr_position_manage.total1]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
||||||
|
<TableCell Name="Cell150" Border.Lines="All" Text="[hr_position_manage.total2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
||||||
|
</TableRow>
|
||||||
|
</TableObject>
|
||||||
|
<TextObject Name="Text46" Left="1228.5" Top="47.25" Width="585.9" Height="47.25" Border.Lines="All" Text="สรุปจำนวน" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
||||||
|
</DataBand>
|
||||||
|
<DataBand Name="Data3" Top="282.51" Width="1814.4" Height="47.25" DataSource="summary">
|
||||||
|
<TableObject Name="Table17" Left="1228.5" Width="585.9" Height="47.25" Border.Lines="All">
|
||||||
|
<TableColumn Name="Column91" Width="255.15"/>
|
||||||
|
<TableColumn Name="Column92" Width="198.45"/>
|
||||||
|
<TableColumn Name="Column93" Width="132.3"/>
|
||||||
|
<TableRow Name="Row17" Height="47.25">
|
||||||
|
<TableCell Name="Cell155" Text="[hr_position_manage.summary.position_name]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
|
||||||
|
<TableCell Name="Cell152" Border.Lines="All" Text="[hr_position_manage.summary.count_position]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
||||||
|
<TableCell Name="Cell153" Border.Lines="All" Text="ราย" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
||||||
|
</TableRow>
|
||||||
|
</TableObject>
|
||||||
</DataBand>
|
</DataBand>
|
||||||
</DataBand>
|
</DataBand>
|
||||||
<ReportSummaryBand Name="ReportSummary1" Top="234.25" Width="1814.4" Height="141.75">
|
<ReportSummaryBand Name="ReportSummary1" Top="335.73" Width="1814.4"/>
|
||||||
<TableObject Name="Table16" Width="519.75" Height="47.25" Border.Lines="All">
|
|
||||||
<TableColumn Name="Column88" Width="245.7"/>
|
|
||||||
<TableColumn Name="Column89" Width="132.3"/>
|
|
||||||
<TableColumn Name="Column90" Width="141.75"/>
|
|
||||||
<TableRow Name="Row16" Height="47.25">
|
|
||||||
<TableCell Name="Cell148" Text="สรุปจำนวนเงิน" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
|
||||||
<TableCell Name="Cell149" Border.Lines="All" Text="[hr_position_manage.total1]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
|
||||||
<TableCell Name="Cell150" Border.Lines="All" Text="[hr_position_manage.total2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
|
||||||
</TableRow>
|
|
||||||
</TableObject>
|
|
||||||
<TableObject Name="Table17" Left="954.45" Width="859.95" Height="141.75" Border.Lines="All">
|
|
||||||
<TableColumn Name="Column91" Width="274.05"/>
|
|
||||||
<TableColumn Name="Column92" Width="122.85"/>
|
|
||||||
<TableColumn Name="Column93" Width="132.3"/>
|
|
||||||
<TableColumn Name="Column94" Width="330.75"/>
|
|
||||||
<TableRow Name="Row17" Height="47.25">
|
|
||||||
<TableCell Name="Cell151" Border.Lines="All" Text="สรุปจำนวน" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
|
||||||
<TableCell Name="Cell152" Border.Lines="All" Text="ศาสตราจารย์" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
|
||||||
<TableCell Name="Cell153" Border.Lines="All" Text="[hr_position_manage.professor]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
|
||||||
<TableCell Name="Cell154" Border.Lines="All" Text="ราย" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
|
||||||
</TableRow>
|
|
||||||
<TableRow Name="Row18" Height="47.25">
|
|
||||||
<TableCell Name="Cell155" Border.Lines="All" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
|
||||||
<TableCell Name="Cell156" Border.Lines="All" Text="รองศาสตราจารย์" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
|
||||||
<TableCell Name="Cell157" Border.Lines="All" Text="[hr_position_manage.associate_rofessor]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
|
||||||
<TableCell Name="Cell158" Border.Lines="All" Text="ราย" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
|
||||||
</TableRow>
|
|
||||||
<TableRow Name="Row19" Height="47.25">
|
|
||||||
<TableCell Name="Cell159" Border.Lines="All" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
|
||||||
<TableCell Name="Cell160" Border.Lines="All" Text="ผู้ช่วยศาสตราจารย์" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
|
||||||
<TableCell Name="Cell161" Border.Lines="All" Text="[hr_position_manage.assistant_professor]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
|
||||||
<TableCell Name="Cell162" Border.Lines="All" Text="ราย" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
|
|
||||||
</TableRow>
|
|
||||||
</TableObject>
|
|
||||||
</ReportSummaryBand>
|
|
||||||
</ReportPage>
|
</ReportPage>
|
||||||
</Report>
|
</Report>
|
||||||
|
|||||||
Reference in New Issue
Block a user