fixed
This commit is contained in:
@@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
@@ -28,7 +29,7 @@ namespace rmutr_report.Controllers
|
|||||||
public IActionResult GetHrReport([FromRoute] string type,
|
public IActionResult GetHrReport([FromRoute] string type,
|
||||||
[FromBody] durable_articles_three durable_articles_threes)
|
[FromBody] durable_articles_three durable_articles_threes)
|
||||||
{
|
{
|
||||||
|
Console.WriteLine(durable_articles_threes.specification_data[0].data_detail[0].data_detail2);
|
||||||
var a1 = durable_articles_threes.data.Where(d => d.amount == d.amount)
|
var a1 = durable_articles_threes.data.Where(d => d.amount == d.amount)
|
||||||
.Sum(o => o.amount);
|
.Sum(o => o.amount);
|
||||||
durable_articles_threes.total_amount = a1;
|
durable_articles_threes.total_amount = a1;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Report ScriptLanguage="CSharp" ReportInfo.Created="03/01/2023 13:13:10" ReportInfo.Modified="04/05/2023 17:07:05" ReportInfo.CreatorVersion="2021.1.0.0">
|
<Report ScriptLanguage="CSharp" ReportInfo.Created="03/01/2023 13:13:10" ReportInfo.Modified="04/05/2023 17:13:01" ReportInfo.CreatorVersion="2021.1.0.0">
|
||||||
<Dictionary>
|
<Dictionary>
|
||||||
<BusinessObjectDataSource Name="durable_articles_three" ReferenceName="durable_articles_three" DataType="null" Enabled="true">
|
<BusinessObjectDataSource Name="durable_articles_three" ReferenceName="durable_articles_three" DataType="null" Enabled="true">
|
||||||
<Column Name="budget_year" DataType="System.String"/>
|
<Column Name="budget_year" DataType="System.String"/>
|
||||||
@@ -150,35 +150,33 @@
|
|||||||
</TableRow>
|
</TableRow>
|
||||||
</TableObject>
|
</TableObject>
|
||||||
</DataBand>
|
</DataBand>
|
||||||
<DataFooterBand Name="DataFooter1" Top="259.18" Width="756" Height="28.35">
|
|
||||||
<TableObject Name="Table3" Width="831.6" Height="28.35">
|
|
||||||
<TableColumn Name="Column9" Width="406.35"/>
|
|
||||||
<TableColumn Name="Column10" Width="132.3"/>
|
|
||||||
<TableColumn Name="Column11" Width="141.75"/>
|
|
||||||
<TableColumn Name="Column12" Width="151.2"/>
|
|
||||||
<TableRow Name="Row3" Height="28.35">
|
|
||||||
<TableCell Name="Cell9" Border.Lines="All" Text="รวมทั้งสิ้น" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
|
|
||||||
<TableCell Name="Cell10" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
|
|
||||||
<TableCell Name="Cell11" Border.Lines="All" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
|
|
||||||
<TableCell Name="Cell12" Border.Lines="All" Text="[durable_articles_three.total_amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
|
|
||||||
</TableRow>
|
|
||||||
</TableObject>
|
|
||||||
</DataFooterBand>
|
|
||||||
</DataBand>
|
</DataBand>
|
||||||
<ReportSummaryBand Name="ReportSummary1" Top="292.03" Width="756" Height="614.25">
|
<ReportSummaryBand Name="ReportSummary1" Top="259.18" Width="756" Height="652.05">
|
||||||
<TextObject Name="Text65" Top="330.75" Width="510.3" Height="28.35" Text="6. เหตุผลความจำเป็น" Font="TH SarabunPSK, 16pt, style=Bold"/>
|
<TextObject Name="Text65" Top="368.55" Width="510.3" Height="28.35" Text="6. เหตุผลความจำเป็น" Font="TH SarabunPSK, 16pt, style=Bold"/>
|
||||||
<TextObject Name="Text66" Top="359.1" Width="831.6" Height="255.15" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.necessity_reason]" AutoWidth="true" WordWrap="false" Font="TH SarabunPSK, 16pt"/>
|
<TextObject Name="Text66" Top="396.9" Width="831.6" Height="255.15" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.necessity_reason]" AutoWidth="true" WordWrap="false" Font="TH SarabunPSK, 16pt"/>
|
||||||
<TextObject Name="Text64" Left="28.35" Top="302.4" Width="831.6" Height="28.35" Text="[durable_articles_three.strategy]" Font="TH SarabunPSK, 16pt"/>
|
<TextObject Name="Text64" Left="28.35" Top="340.2" Width="831.6" Height="28.35" Text="[durable_articles_three.strategy]" Font="TH SarabunPSK, 16pt"/>
|
||||||
<TextObject Name="Text63" Top="274.05" Width="510.3" Height="28.35" Text="5. ความสอดคล้องกับกลยุทธ์" Font="TH SarabunPSK, 16pt, style=Bold"/>
|
<TextObject Name="Text63" Top="311.85" Width="510.3" Height="28.35" Text="5. ความสอดคล้องกับกลยุทธ์" Font="TH SarabunPSK, 16pt, style=Bold"/>
|
||||||
<TextObject Name="Text62" Left="28.35" Top="245.7" Width="831.6" Height="28.35" Text="[durable_articles_three.target]" Font="TH SarabunPSK, 16pt"/>
|
<TextObject Name="Text62" Left="28.35" Top="283.5" Width="831.6" Height="28.35" Text="[durable_articles_three.target]" Font="TH SarabunPSK, 16pt"/>
|
||||||
<TextObject Name="Text61" Top="217.35" Width="510.3" Height="28.35" Text="4. ความสอดคล้องกับเป้าหมาย" Font="TH SarabunPSK, 16pt, style=Bold"/>
|
<TextObject Name="Text61" Top="255.15" Width="510.3" Height="28.35" Text="4. ความสอดคล้องกับเป้าหมาย" Font="TH SarabunPSK, 16pt, style=Bold"/>
|
||||||
<TextObject Name="Text59" Top="122.85" Width="510.3" Height="28.35" Text="3. ความสอดคล้องกับประเด็นยุทธศาสตร์" Font="TH SarabunPSK, 16pt, style=Bold"/>
|
<TextObject Name="Text59" Top="160.65" Width="510.3" Height="28.35" Text="3. ความสอดคล้องกับประเด็นยุทธศาสตร์" Font="TH SarabunPSK, 16pt, style=Bold"/>
|
||||||
<TextObject Name="Text60" Left="28.35" Top="141.75" Width="831.6" Height="66.15" Text="[durable_articles_three.strategic_issues]" Font="TH SarabunPSK, 16pt"/>
|
<TextObject Name="Text60" Left="28.35" Top="179.55" Width="831.6" Height="66.15" Text="[durable_articles_three.strategic_issues]" Font="TH SarabunPSK, 16pt"/>
|
||||||
<TextObject Name="Text58" Left="28.35" Top="85.05" Width="614.25" Height="28.35" Text="[durable_articles_three.durable_from]" Font="TH SarabunPSK, 16pt"/>
|
<TextObject Name="Text58" Left="28.35" Top="122.85" Width="614.25" Height="28.35" Text="[durable_articles_three.durable_from]" Font="TH SarabunPSK, 16pt"/>
|
||||||
<TextObject Name="Text57" Top="56.7" Width="292.95" Height="28.35" Text="ครุภัณฑ์สั่งจาก" Font="TH SarabunPSK, 16pt, style=Bold, Underline"/>
|
<TextObject Name="Text57" Top="94.5" Width="292.95" Height="28.35" Text="ครุภัณฑ์สั่งจาก" Font="TH SarabunPSK, 16pt, style=Bold, Underline"/>
|
||||||
<TextObject Name="Text55" Left="28.35" Top="28.35" Width="217.35" Height="28.35" Text="[durable_articles_three.durable_type]" Font="TH SarabunPSK, 16pt"/>
|
<TextObject Name="Text55" Left="28.35" Top="66.15" Width="217.35" Height="28.35" Text="[durable_articles_three.durable_type]" Font="TH SarabunPSK, 16pt"/>
|
||||||
<TextObject Name="Text56" Left="245.7" Top="28.35" Width="576.45" Height="28.35" Text="ระบุชื่ออาคาร [durable_articles_three.building_name] ห้อง [durable_articles_three.room_name]" Font="TH SarabunPSK, 16pt"/>
|
<TextObject Name="Text56" Left="245.7" Top="66.15" Width="576.45" Height="28.35" Text="ระบุชื่ออาคาร [durable_articles_three.building_name] ห้อง [durable_articles_three.room_name]" Font="TH SarabunPSK, 16pt"/>
|
||||||
<TextObject Name="Text54" Width="292.95" Height="28.35" Text="2. ประเภทครุภัณฑ์" Font="TH SarabunPSK, 16pt, style=Bold"/>
|
<TextObject Name="Text54" Top="37.8" Width="292.95" Height="28.35" Text="2. ประเภทครุภัณฑ์" Font="TH SarabunPSK, 16pt, style=Bold"/>
|
||||||
|
<TableObject Name="Table3" Width="831.6" Height="28.35">
|
||||||
|
<TableColumn Name="Column9" Width="406.35"/>
|
||||||
|
<TableColumn Name="Column10" Width="132.3"/>
|
||||||
|
<TableColumn Name="Column11" Width="141.75"/>
|
||||||
|
<TableColumn Name="Column12" Width="151.2"/>
|
||||||
|
<TableRow Name="Row3" Height="28.35">
|
||||||
|
<TableCell Name="Cell9" Border.Lines="All" Text="รวมทั้งสิ้น" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
|
||||||
|
<TableCell Name="Cell10" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
|
||||||
|
<TableCell Name="Cell11" Border.Lines="All" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
|
||||||
|
<TableCell Name="Cell12" Border.Lines="All" Text="[durable_articles_three.total_amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
|
||||||
|
</TableRow>
|
||||||
|
</TableObject>
|
||||||
</ReportSummaryBand>
|
</ReportSummaryBand>
|
||||||
</ReportPage>
|
</ReportPage>
|
||||||
<ReportPage Name="Page2" PaperWidth="240" LeftMargin="25" TopMargin="20" RightMargin="15" Watermark.Font="Arial, 60pt">
|
<ReportPage Name="Page2" PaperWidth="240" LeftMargin="25" TopMargin="20" RightMargin="15" Watermark.Font="Arial, 60pt">
|
||||||
@@ -383,8 +381,8 @@
|
|||||||
<TextObject Name="Text123" Top="28.35" Width="831.6" Height="28.35" Text="[durable_articles_three.cases]" Font="TH SarabunPSK, 16pt, style=Bold"/>
|
<TextObject Name="Text123" Top="28.35" Width="831.6" Height="28.35" Text="[durable_articles_three.cases]" Font="TH SarabunPSK, 16pt, style=Bold"/>
|
||||||
<DataBand Name="Data19" Top="409.92" Width="756" Height="160.65" DataSource="invest_detail">
|
<DataBand Name="Data19" Top="409.92" Width="756" Height="160.65" DataSource="invest_detail">
|
||||||
<TextObject Name="Text124" Left="37.8" Width="831.6" Height="28.35" Text="[durable_articles_three.invest_detail.list]" Font="TH SarabunPSK, 16pt, style=Bold"/>
|
<TextObject Name="Text124" Left="37.8" Width="831.6" Height="28.35" Text="[durable_articles_three.invest_detail.list]" Font="TH SarabunPSK, 16pt, style=Bold"/>
|
||||||
<TextObject Name="Text133" Left="56.7" Top="85.05" Width="831.6" Height="75.6" GrowToBottom="true" Text="[durable_articles_three.invest_detail.remark]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="9" Font="TH SarabunPSK, 16pt"/>
|
<TextObject Name="Text133" Left="56.7" Top="85.05" Width="831.6" Height="75.6" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.invest_detail.remark]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="16" WordWrap="false" Font="TH SarabunPSK, 16pt"/>
|
||||||
<TextObject Name="Text132" Left="37.8" Top="28.35" Width="831.6" Height="56.7" Text="[durable_articles_three.invest_detail.answer]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="9" Font="TH SarabunPSK, 16pt"/>
|
<TextObject Name="Text132" Left="37.8" Top="28.35" Width="831.6" Height="56.7" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.invest_detail.answer]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="16" WordWrap="false" Font="TH SarabunPSK, 16pt"/>
|
||||||
</DataBand>
|
</DataBand>
|
||||||
</DataBand>
|
</DataBand>
|
||||||
</ReportPage>
|
</ReportPage>
|
||||||
|
|||||||
Reference in New Issue
Block a user