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

update
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
kamonwan taengsuk
2023-11-24 16:09:02 +07:00
parent 5ba7919b29
commit 4e25c3a694
13 changed files with 164 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
Controllers/RoThree.Controller.cs
View File

@@ -1344,7 +1344,7 @@ namespace rmutr_report.Controllers
// return Ok();
// }
[SwaggerOperation("ค่าใช้จ่ายดำเนินงาน รายละเอียดการคำนวณค่าใช้จ่ายในการประชุม")]
[SwaggerOperation("1 ค่าอาหารว่าง 2 ค่าเบี้ยประชุมคณะกรรมการ")]
[HttpPost, Route("reports/calculate_meeting_expenses/{type}")]
[ApiExplorerSettings(GroupName = "reports")]
public IActionResult GetCalReport([FromRoute] string type,
@@ -1367,50 +1367,37 @@ namespace rmutr_report.Controllers
calculate.text4 = "รวมค่าเบี้ยประชุม";
}
//var newlist = new List<calculate_meeting_expenses>() { };
//var newlist2 = newlist.SelectMany(newlist => newlist.data);
//var newList = new List<calculate_meeting_expenses>() { };
//var newList2 = newList.SelectMany(f => f.data).Where(d => d.topic_type == 2).Sum(g => g.disbursement_result);
int n = 1;
foreach (var data in calculate.data)
foreach (var data in calculate.data)
{
int r = 1;
if (data.topic_type == 1)
{
data.row_no = null;
data.no = n.ToString();
n++;
}
}
if (data.topic_type == 2)
{
data.total = data.expense_rate * data.count_person * data.count_meetings;
}
}
calculate.disbursement_result = c.Where(e => e.topic_type == 1).Sum(d => d.disbursement_result);
calculate.expense_rate = c.Where(e => e.topic_type == 1).Sum(d => d.expense_rate);
calculate.count_person = c.Where(e => e.topic_type == 1).Sum(d => d.count_person);
calculate.count_meetings = c.Where(e => e.topic_type == 1).Sum(d => d.count_meetings);
calculate.total = c.Where(e => e.topic_type == 1).Sum(d => d.total);
var calculateMeeting = new List<calculate_meeting_expenses>() { calculate };
// calculate.data.Add(new calculate_meeting_expenses_data_datail()
// {
// topic_type = 1,
// disbursement_result = calculateMeeting.SelectMany(d => d.data).Where(t => t.topic_type == 2)
// .Sum(c => c.disbursement_result),
// count_person = calculateMeeting.SelectMany(d => d.data).Where(t => t.topic_type == 2)
// .Sum(c => c.count_person)
// });
// foreach (var cc in c)
// {
// if (cc.topic_type==1)
// {
// cc.disbursement_result = calculateMeeting.SelectMany(d => d.data).Where(t => t.topic_type == 2)
// .Sum(c => c.disbursement_result);
// cc.count_person = calculateMeeting.SelectMany(d => d.data).Where(t => t.topic_type == 2)
// .Sum(c => c.count_person);
// }
//
// }
Report report = new Report();
report.Load(_setting.report_path + "calculate_meeting_expenses.frx");
report.RegisterData(calculateMeeting, "calculate_meeting_expenses");
@@ -1438,5 +1425,48 @@ namespace rmutr_report.Controllers
return Ok();
}
[SwaggerOperation("ค่าตอบแทนผู้ปฏิบัติงานให้ราชการ (ค่าควบคุมงานก่อสร้าง)")]
[HttpPost, Route("reports/control_cost_construction_wages/{type}")]
[ApiExplorerSettings(GroupName = "reports")]
public IActionResult GetConstructionReport([FromRoute] string type,
[FromBody] control_cost_construction_wages _expense)
{
var wages = _expense.data.ToList();
foreach (var detail in _expense.data)
{
detail.total_amount = (detail.quantity_work*detail.quantity_day * detail.quantity_person * detail.amount);
}
_expense.total_amount = wages.Sum(f => f.total_amount);
var expenses = new List<control_cost_construction_wages>() { _expense };
Report report = new Report();
report.Load(_setting.report_path + "control_cost_construction_wages.frx");
report.RegisterData(expenses, "control_cost_construction_wages");
report.Prepare();
MemoryStream stream = new MemoryStream();
switch (type)
{
case "pdf":
PDFExport pdf = new PDFExport();
report.Export(pdf, stream);
stream.Seek(0, SeekOrigin.Begin);
return File(stream, "application/pdf");
case "xls":
case "xlsx":
Excel2007Export excel = new Excel2007Export();
report.Export(excel, stream);
stream.Seek(0, SeekOrigin.Begin);
return File(
stream,
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
"control_cost_construction_wages" + ".xlsx");
}
return Ok();
}
}
}

2
Models/RoReport/calculate_meeting_expenses.cs
View File

@@ -24,7 +24,7 @@ namespace rmutr_report.Models.RoThree
public class calculate_meeting_expenses_data_datail
{
public int? topic_type { get; set; } //1 2
public int? topic_type { get; set; } //1 สีเหลือง 2 ข้อย่อย
public string no { get; set; }
public string row_no { get; set; }
public string topic_name { get; set; }

14
Models/budget/control_cost_construction.cs
View File

@@ -17,4 +17,18 @@ namespace rmutr_report.Models
public decimal? quantity_work { get; set; }
public decimal? total_amount { get; set; }
}
public class control_cost_construction_wages
{
public decimal? total_amount { get; set; }
public List<control_cost_construction_wages_detail> data { get; set; }
}
public class control_cost_construction_wages_detail
{
public decimal? quantity_day { get; set; }
public decimal? quantity_person { get; set; }
public decimal? amount { get; set; }
public decimal? quantity_work { get; set; }
public decimal? total_amount { 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.

16
obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props
View File

@@ -384,6 +384,22 @@
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\control_cost_construction.frx))</OriginalItemSpec>
</StaticWebAsset>
<StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\control_cost_construction_wages.frx))">
<SourceType>Package</SourceType>
<SourceId>rmutr_report</SourceId>
<ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
<BasePath>_content/rmutr_report</BasePath>
<RelativePath>reports\control_cost_construction_wages.frx</RelativePath>
<AssetKind></AssetKind>
<AssetMode></AssetMode>
<AssetRole></AssetRole>
<RelatedAsset></RelatedAsset>
<AssetTraitName></AssetTraitName>
<AssetTraitValue></AssetTraitValue>
<CopyToOutputDirectory></CopyToOutputDirectory>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\control_cost_construction_wages.frx))</OriginalItemSpec>
</StaticWebAsset>
<StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\data_line_academic.frx))">
<SourceType>Package</SourceType>
<SourceId>rmutr_report</SourceId>

2
obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache
View File

@@ -1 +1 @@
9f07dd534e278fa2dd7afca679d31a5d182378cc
dea208d6dcf8aff820dcbc6409c4fd9e41c662bb

2
obj/rider.project.model.nuget.info
View File

@@ -1 +1 @@
17007343045432872
17007993899443636

2
obj/rider.project.restore.info
View File

@@ -1 +1 @@
17007343045432872
17008168824080162

39
wwwroot/reports/calculate_meeting_expenses.frx
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="01/13/2021 00:11:35" ReportInfo.Modified="11/23/2023 14:59:22" ReportInfo.CreatorVersion="2021.1.0.0">
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="01/13/2021 00:11:35" ReportInfo.Modified="11/22/2023 19:09:59" ReportInfo.CreatorVersion="2021.1.0.0">
<Dictionary>
<BusinessObjectDataSource Name="calculate_meeting_expenses" ReferenceName="calculate_meeting_expenses" DataType="null" Enabled="true">
<Column Name="budget_year" DataType="System.String"/>
@@ -96,56 +96,31 @@
<Condition Expression="[calculate_meeting_expenses.data.topic_type]== 2" Fill.Color="White" Font="TH SarabunPSK, 14.25pt" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/>
</Highlight>
</TableCell>
<TableCell Name="Cell28" Border.Lines="All" Text="[calculate_meeting_expenses.data.disbursement_result]" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 14pt">
<Formats>
<NumberFormat DecimalDigits="0"/>
<GeneralFormat/>
<GeneralFormat/>
</Formats>
<TableCell Name="Cell28" Border.Lines="All" Text="[calculate_meeting_expenses.data.disbursement_result]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 14pt">
<Highlight>
<Condition Expression="[calculate_meeting_expenses.data.topic_type]== 1" Fill.Color="255, 242, 204" Font="TH SarabunPSK, 14.25pt, style=Bold" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/>
<Condition Expression="[calculate_meeting_expenses.data.topic_type]== 2" Fill.Color="White" Font="TH SarabunPSK, 14.25pt" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/>
</Highlight>
</TableCell>
<TableCell Name="Cell29" Border.Lines="All" Text="[calculate_meeting_expenses.data.expense_rate]" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 14pt">
<Formats>
<NumberFormat DecimalDigits="0"/>
<GeneralFormat/>
<GeneralFormat/>
</Formats>
<TableCell Name="Cell29" Border.Lines="All" Text="[calculate_meeting_expenses.data.expense_rate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 14pt">
<Highlight>
<Condition Expression="[calculate_meeting_expenses.data.topic_type]== 1" Fill.Color="255, 242, 204" Font="TH SarabunPSK, 14.25pt, style=Bold" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/>
<Condition Expression="[calculate_meeting_expenses.data.topic_type]== 2" Fill.Color="White" Font="TH SarabunPSK, 14.25pt" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/>
</Highlight>
</TableCell>
<TableCell Name="Cell30" Border.Lines="All" Text="[calculate_meeting_expenses.data.count_person]" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 14pt">
<Formats>
<NumberFormat DecimalDigits="0"/>
<GeneralFormat/>
<GeneralFormat/>
</Formats>
<TableCell Name="Cell30" Border.Lines="All" Text="[calculate_meeting_expenses.data.count_person]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 14pt">
<Highlight>
<Condition Expression="[calculate_meeting_expenses.data.topic_type]== 1" Fill.Color="255, 242, 204" Font="TH SarabunPSK, 14.25pt, style=Bold" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/>
<Condition Expression="[calculate_meeting_expenses.data.topic_type]== 2" Fill.Color="White" Font="TH SarabunPSK, 14.25pt" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/>
</Highlight>
</TableCell>
<TableCell Name="Cell40" Border.Lines="All" Text="[calculate_meeting_expenses.data.count_meetings]" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 14pt">
<Formats>
<NumberFormat DecimalDigits="0"/>
<GeneralFormat/>
<GeneralFormat/>
</Formats>
<TableCell Name="Cell40" Border.Lines="All" Text="[calculate_meeting_expenses.data.count_meetings]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 14pt">
<Highlight>
<Condition Expression="[calculate_meeting_expenses.data.topic_type]== 1" Fill.Color="255, 242, 204" Font="TH SarabunPSK, 14.25pt, style=Bold" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/>
<Condition Expression="[calculate_meeting_expenses.data.topic_type]== 2" Fill.Color="White" Font="TH SarabunPSK, 14.25pt" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/>
</Highlight>
</TableCell>
<TableCell Name="Cell78" Border.Lines="All" Text="[calculate_meeting_expenses.data.total]" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 14pt">
<Formats>
<NumberFormat DecimalDigits="0"/>
<GeneralFormat/>
<GeneralFormat/>
</Formats>
<Highlight>
<Condition Expression="[calculate_meeting_expenses.data.topic_type]== 1" Fill.Color="255, 242, 204" Font="TH SarabunPSK, 14.25pt, style=Bold" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/>
<Condition Expression="[calculate_meeting_expenses.data.topic_type]== 2" Fill.Color="White" Font="TH SarabunPSK, 14.25pt" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/>
@@ -176,4 +151,4 @@
</TableObject>
</ReportSummaryBand>
</ReportPage>
</Report>
</Report>

68
wwwroot/reports/control_cost_construction_wages.frx Normal file
View File

@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="01/13/2021 00:11:35" ReportInfo.Modified="11/24/2023 16:07:35" ReportInfo.CreatorVersion="2021.1.0.0">
<Dictionary>
<BusinessObjectDataSource Name="control_cost_construction_wages" ReferenceName="control_cost_construction_wages" DataType="null" Enabled="true">
<Column Name="total_amount" DataType="System.Decimal"/>
<BusinessObjectDataSource Name="data" DataType="null" Enabled="true">
<Column Name="quantity_day" DataType="System.Decimal"/>
<Column Name="quantity_person" DataType="System.Decimal"/>
<Column Name="amount" DataType="System.Decimal"/>
<Column Name="quantity_work" DataType="System.Decimal"/>
<Column Name="total_amount" DataType="System.Decimal"/>
</BusinessObjectDataSource>
</BusinessObjectDataSource>
</Dictionary>
<ReportPage Name="Sheet1" Landscape="true" PaperWidth="297" PaperHeight="210" RawPaperSize="9" Watermark.Font="Arial, 60pt">
<PageHeaderBand Name="PageHeader1" Width="1047.06" Height="85.05">
<TextObject Name="Text1" Width="737.1" Height="37.8" Text="ค่าควบคุมงานก่อสร้าง" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
<TableObject Name="Table1" Top="37.8" Width="737.14" Height="47.25">
<TableColumn Name="Column1" Width="160.67"/>
<TableColumn Name="Column2" Width="141.77"/>
<TableColumn Name="Column3" Width="141.75"/>
<TableColumn Name="Column4" Width="141.75"/>
<TableColumn Name="Column19" Width="151.2"/>
<TableRow Name="Row1" Height="47.25">
<TableCell Name="Cell1" Border.Lines="All" Fill.Color="214, 220, 228" Text="จำนวนวันก่อสร้าง" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
<TableCell Name="Cell2" Border.Lines="All" Fill.Color="214, 220, 228" Text="จำนวน (คน)" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
<TableCell Name="Cell3" Border.Lines="All" Fill.Color="214, 220, 228" Text="จำนวนเงิน" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
<TableCell Name="Cell4" Border.Lines="All" Fill.Color="214, 220, 228" Text="จำนวนงาน/อาคาร" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
<TableCell Name="Cell19" Border.Lines="All" Fill.Color="214, 220, 228" Text="จำนวนเงินรวม" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
</TableRow>
</TableObject>
</PageHeaderBand>
<DataBand Name="Data1" Top="89.76" Width="1047.06">
<DataBand Name="Data3" Top="94.46" Width="1047.06" Height="37.8" DataSource="data">
<TableObject Name="Table2" Width="737.14" Height="37.8">
<TableColumn Name="Column15" Width="160.67"/>
<TableColumn Name="Column16" Width="141.77"/>
<TableColumn Name="Column17" Width="141.75"/>
<TableColumn Name="Column18" Width="141.75"/>
<TableColumn Name="Column21" Width="151.2"/>
<TableRow Name="Row2" Height="37.8">
<TableCell Name="Cell15" Border.Lines="All" Text="[control_cost_construction_wages.data.quantity_day]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt"/>
<TableCell Name="Cell16" Border.Lines="All" Text="[control_cost_construction_wages.data.quantity_person]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt"/>
<TableCell Name="Cell17" Border.Lines="All" Text="[control_cost_construction_wages.data.amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrinkMinSize="11" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 16pt"/>
<TableCell Name="Cell18" Border.Lines="All" Text="[control_cost_construction_wages.data.quantity_work]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrinkMinSize="9" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt"/>
<TableCell Name="Cell21" Border.Lines="All" Text="[control_cost_construction_wages.data.total_amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 16pt"/>
</TableRow>
</TableObject>
</DataBand>
</DataBand>
<ReportSummaryBand Name="ReportSummary1" Top="136.97" Width="1047.06" Height="37.8">
<TableObject Name="Table3" Width="737.14" Height="37.8">
<TableColumn Name="Column22" Width="160.67"/>
<TableColumn Name="Column23" Width="85.07"/>
<TableColumn Name="Column24" Width="141.75"/>
<TableColumn Name="Column25" Width="198.45"/>
<TableColumn Name="Column26" Width="151.2"/>
<TableRow Name="Row3" Height="37.8">
<TableCell Name="Cell22" Border.Lines="All" Fill.Color="214, 220, 228" Text="จำนวนเงินรวมทั้งสิ้น" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold" ColSpan="4"/>
<TableCell Name="Cell23" Border.Lines="All" Fill.Color="214, 220, 228" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
<TableCell Name="Cell24" Border.Lines="All" Fill.Color="214, 220, 228" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
<TableCell Name="Cell25" Border.Lines="All" Fill.Color="214, 220, 228" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="9" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
<TableCell Name="Cell26" Border.Lines="All" Fill.Color="214, 220, 228" Text="[control_cost_construction_wages.total_amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
</TableRow>
</TableObject>
</ReportSummaryBand>
</ReportPage>
</Report>