kamonwantaengsuk/rmutr_report
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

update

Browse Source
This commit is contained in:
kamonwan taengsuk
2023-07-13 19:20:34 +07:00
parent be208e3f5c
commit 4ce4d619d6
7 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Controllers/Budget.Controller.cs
View File

@@ -2322,6 +2322,12 @@ namespace rmutr_report.Controllers
public IActionResult GetBudgetExpenditureRevenueReport([FromRoute] string type,
[FromBody] budget_expenditure_report_from_revenue budget)
{
var b = budget.budgets.ToArray();
foreach (var bb in b)
{
bb.personnel_list_s = new List<personnel_list> { bb.personnel_lists };
}
var budgetExpenditure = new List<budget_expenditure_report_from_revenue>() { budget };
Report report = new Report();

10
Models/budget/budget_expenditure_report_from_revenue.cs
View File

@@ -5,7 +5,7 @@ namespace rmutr_report.Models
public class budget_expenditure_report_from_revenue
{
public string academic_year_name_th { get; set; }
//public string start_and_end_date_report { get; set; }
public string sector { get; set; } //ภาค
//public string revenue_estimates_type { get; set; }
@@ -23,7 +23,8 @@ namespace rmutr_report.Models
{
public decimal? total { get; set; } //แผนงาน
public List<personnel_list> personnel_lists { get; set; }
public personnel_list personnel_lists { get; set; }
public List<personnel_list> personnel_list_s { get; set; }
}
public class personnel_list //รายการบุคลกร
@@ -52,15 +53,14 @@ namespace rmutr_report.Models
public string topic { get; set; }
public decimal? rate { get; set; }
public decimal? total { get; set; }
public List<budget_rate_details> details { get; set; }
public List<details> details { get; set; }
}
public class budget_rate_details //อันรองลงมา
public class details //อันรองลงมา
{
public string position_level { get; set; }
public string qualification { get; set; }
public decimal? rate { get; set; }
public decimal? total { get; set; }
}
}

BIN
bin/Debug/netcoreapp3.1/rmutr_report.dll
View File

Binary file not shown.

BIN
bin/Debug/netcoreapp3.1/rmutr_report.pdb
View File

Binary file not shown.

BIN
obj/Debug/netcoreapp3.1/rmutr_report.dll
View File

Binary file not shown.

BIN
obj/Debug/netcoreapp3.1/rmutr_report.pdb
View File

Binary file not shown.

34
wwwroot/reports/budget_expenditure_report_from_revenue.frx
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="07/13/2023 18:34:02" ReportInfo.CreatorVersion="2021.1.0.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="07/13/2023 19:10:42" ReportInfo.CreatorVersion="2021.1.0.0">
<Dictionary>
<BusinessObjectDataSource Name="budget_expenditure_report_from_revenue" ReferenceName="budget_expenditure_report_from_revenue" DataType="null" Enabled="true">
<Column Name="academic_year_name_th" DataType="System.String"/>
@@ -9,7 +9,7 @@
<Column Name="total" DataType="System.Decimal"/>
<BusinessObjectDataSource Name="budgets" DataType="System.Int32" Enabled="true">
<Column Name="total" DataType="System.Decimal"/>
<BusinessObjectDataSource Name="personnel_lists" DataType="System.Int32" Enabled="true">
<BusinessObjectDataSource Name="personnel_list_s" DataType="System.Int32" Enabled="true">
<Column Name="total" DataType="System.Decimal"/>
<BusinessObjectDataSource Name="budget_personnel_lists" DataType="System.Int32" Enabled="true">
<Column Name="rate" DataType="System.Decimal"/>
@@ -35,7 +35,7 @@
</BusinessObjectDataSource>
</BusinessObjectDataSource>
</Dictionary>
<ReportPage Name="Page1" Landscape="true" PaperWidth="270" PaperHeight="210" Watermark.Font="Arial, 60pt">
<ReportPage Name="Page1" Landscape="true" PaperWidth="270" PaperHeight="400" Watermark.Font="Arial, 60pt">
<PageHeaderBand Name="PageHeader1" Width="945" Height="207.9">
<TextObject Name="Text1" Width="945" Height="28.35" Text="งบประมาณรายจ่ายจากเงินรายได้ ประปีงบประมาณ พ.ศ. [budget_expenditure_report_from_revenue.academic_year_name_th]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
<TextObject Name="Text2" Top="28.35" Width="945" Height="28.35" Text="( 1 ตุลาคม 2565 - 30 กันยายน 2566 )" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
@@ -58,41 +58,41 @@
<TextObject Name="Text11" Width="226.8" Height="28.35" Text="แผนงานบุคลากรภาครัฐ" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
<TextObject Name="Text12" Left="727.65" Width="141.75" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
<TextObject Name="Text13" Left="869.4" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 18pt"/>
<DataBand Name="Data4" Top="251.83" Width="945" Height="28.35" DataSource="personnel_lists">
<DataBand Name="Data4" Top="251.83" Width="945" Height="28.35" DataSource="personnel_list_s">
<LineObject Name="Line6" Left="699.3" Top="28.35" Width="141.75" Diagonal="true"/>
<TextObject Name="Text16" Left="841.05" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text14" Left="18.9" Width="207.9" Height="28.35" Text="รายการบุคลากร" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Underline"/>
<TextObject Name="Text15" Left="699.3" Width="141.75" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_lists.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text15" Left="699.3" Width="141.75" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<DataBand Name="Data5" Top="285.38" Width="945" Height="28.35" DataSource="budget_personnel_lists">
<LineObject Name="Line7" Left="689.85" Top="28.35" Width="122.85" Diagonal="true"/>
<TextObject Name="Text20" Left="689.85" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_lists.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text20" Left="689.85" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text17" Left="37.8" Width="207.9" Height="28.35" Text="งบบุคลากร" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Underline"/>
<TextObject Name="Text18" Left="576.45" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_lists.budget_personnel_lists.rate]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text18" Left="576.45" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.rate]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text19" Left="623.7" Width="47.25" Height="28.35" Text="อัตรา" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text21" Left="812.7" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<DataBand Name="Data6" Top="318.92" Width="945" Height="28.35" DataSource="budget_personnel_lists_2">
<LineObject Name="Line8" Left="661.5" Top="28.35" Width="122.85" Diagonal="true"/>
<TextObject Name="Text22" Left="47.25" Width="37.8" Height="28.35" Text="[Row#]." HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
<TextObject Name="Text23" Left="85.05" Width="160.65" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_lists.budget_personnel_lists.budget_personnel_lists_2.topic]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
<TextObject Name="Text24" Left="576.45" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_lists.budget_personnel_lists.budget_personnel_lists_2.rate]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text23" Left="85.05" Width="340.2" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.topic]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
<TextObject Name="Text24" Left="576.45" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.rate]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text25" Left="614.25" Width="47.25" Height="28.35" Text="อัตรา" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text26" Left="661.5" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_lists.budget_personnel_lists.budget_personnel_lists_2.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text26" Left="661.5" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text27" Left="784.35" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<DataBand Name="Data7" Top="352.47" Width="945" Height="28.35" DataSource="budget_rates">
<TextObject Name="Text28" Left="85.05" Width="37.8" Height="28.35" Text="[Row#]." HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
<TextObject Name="Text29" Left="122.85" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_lists.budget_personnel_lists.budget_personnel_lists_2.budget_rates.topic]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
<TextObject Name="Text30" Left="538.65" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_lists.budget_personnel_lists.budget_personnel_lists_2.budget_rates.rate]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
<TextObject Name="Text29" Left="122.85" Width="302.4" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.topic]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
<TextObject Name="Text30" Left="538.65" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.rate]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
<TextObject Name="Text31" Left="567" Width="47.25" Height="28.35" Text="อัตรา" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
<TextObject Name="Text32" Left="633.15" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_lists.budget_personnel_lists.budget_personnel_lists_2.budget_rates.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
<TextObject Name="Text32" Left="633.15" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
<TextObject Name="Text33" Left="756" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
<LineObject Name="Line9" Left="633.15" Top="28.35" Width="122.85" Diagonal="true"/>
<DataBand Name="Data1" Top="386.01" Width="945" Height="28.35" DataSource="details">
<LineObject Name="Line10" Left="633.15" Top="28.35" Width="94.5" Diagonal="true"/>
<TextObject Name="Text39" Left="633.15" Width="94.5" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_lists.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text39" Left="633.15" Width="94.5" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text34" Left="122.85" Width="37.8" Height="28.35" Text="[Row#]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text35" Left="160.65" Width="179.55" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_lists.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.position_level]" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text36" Left="340.2" Width="179.55" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_lists.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.qualification]" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text37" Left="538.65" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_lists.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.rate]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text35" Left="160.65" Width="179.55" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.position_level]" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text36" Left="340.2" Width="179.55" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.qualification]" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text37" Left="538.65" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.rate]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text38" Left="567" Width="47.25" Height="28.35" Text="อัตรา" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text40" Left="727.65" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
</DataBand>