This commit is contained in:
@@ -2831,7 +2831,7 @@ namespace rmutr_report.Controllers
|
|||||||
}
|
}
|
||||||
|
|
||||||
var sum1 = budget.details.Where(f=>f.topic_type==1).Sum(d => d.value1);
|
var sum1 = budget.details.Where(f=>f.topic_type==1).Sum(d => d.value1);
|
||||||
var sum2 = budget.details.Where(f=>f.topic_type==2).Sum(d => d.value2);
|
var sum2 = budget.details.Where(f=>f.topic_type==2&&f.topic == "รายการบุคลากร").Sum(d => d.value2);
|
||||||
budget.total = sum1+sum2;
|
budget.total = sum1+sum2;
|
||||||
|
|
||||||
var budgetExpenditure = new List<budget_expenditure_report_from_revenue_v2>() { budget };
|
var budgetExpenditure = new List<budget_expenditure_report_from_revenue_v2>() { budget };
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -14,7 +14,7 @@ using System.Reflection;
|
|||||||
[assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")]
|
[assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")]
|
||||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
||||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+28053412e780bc3285cdba6f9429908f29b578e1")]
|
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7137b4f2c26e4bfccefcbb23a79b0766b3b1d9d9")]
|
||||||
[assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
|
[assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
|
||||||
[assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
|
[assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
|
||||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
c930d5c248796f391f6acd0016fb66ad32d9e616e81b02e67616561e4789b2b0
|
4fc55d7fe67163ea39ae278786d3fa415d97ea0737e0aadc65b0b3c224d08a73
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
5209e9a391e50710c07ef593fa84f1095f37445ac4e9138522140847a8c036ae
|
18d969bee34f2773c817401f309a2895e4bed6fa15fa976682d2da1b92c7a164
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user