diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index 5a7c005..a738633 100644 --- a/Controllers/Budget.Controller.cs +++ b/Controllers/Budget.Controller.cs @@ -2770,7 +2770,7 @@ namespace rmutr_report.Controllers indetail.topic9 = indetail.topic; indetail.topic10 = indetail.qualification; indetail.amount9 = indetail.value1; - indetail.amount10 = indetail.value2; + indetail.amount10 = indetail.value2*indetail.value1; indetail.text9 = "อัตรา"; indetail.text10 = "บาท"; indetail.row_no3 = no3; @@ -2847,6 +2847,8 @@ namespace rmutr_report.Controllers no8++; } } + + budget.total = budget.details.Where(f=>f.topic_type==1).Sum(d => d.amount1); var budgetExpenditure = new List() { budget }; Report report = new Report(); diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs index c05d7ea..b0159ae 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1301ecaeca8b11468450927aa7dd4e89884d9ab9")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ad7e631bf7e42daeec9b6a95f26c164545940a8b")] [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache index 9516f03..f0f4ddc 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -8dc64ff8016cc4e4a4cc2f7796990f628d2815ca6f83df04926c9688dfe6c632 +a306e0787253414ac78b021754a61c89956f46a0bc6e3ccde2346272350fa1c1