bug fixed
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
kamonwan taengsuk
2023-08-30 17:22:25 +07:00
parent 0d68171be0
commit f7680ffb3e
15 changed files with 204 additions and 348 deletions

View File

@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using ClosedXML.Excel;
using FastReport;
using FastReport.Export.Csv;
@@ -65,6 +66,21 @@ namespace rmutr_report.Controllers
}
}
if (project.sixteenths != null)
{
foreach (var sixteenthData in project.sixteenths)
{
var sum1 = sixteenthData.sixteenths2.Sum(d => d.salaya);
var sum2 = sixteenthData.sixteenths2.Sum(d => d.bophitphimuk);
var sum3 = sixteenthData.sixteenths2.Sum(d => d.pohchang);
var sum4 = sixteenthData.sixteenths2.Sum(d => d.klai_kangwon);
sixteenthData.salaya_total = sum1;
sixteenthData.bophitphimuk_total = sum2;
sixteenthData.pohchang_total = sum3;
sixteenthData.klai_kangwon_total = sum4;
}
}
if (project.eighteenth != null)
{
foreach (var v in project.eighteenth)
@@ -248,6 +264,21 @@ namespace rmutr_report.Controllers
}
}
if (project.sixteenths != null)
{
foreach (var sixteenthData in project.sixteenths)
{
var sum1 = sixteenthData.sixteenths2.Sum(d => d.salaya);
var sum2 = sixteenthData.sixteenths2.Sum(d => d.bophitphimuk);
var sum3 = sixteenthData.sixteenths2.Sum(d => d.pohchang);
var sum4 = sixteenthData.sixteenths2.Sum(d => d.klai_kangwon);
sixteenthData.salaya_total = sum1;
sixteenthData.bophitphimuk_total = sum2;
sixteenthData.pohchang_total = sum3;
sixteenthData.klai_kangwon_total = sum4;
}
}
if (project.eighteenth != null)
{
foreach (var v in project.eighteenth)