Update

2024-08-20 17:07:20 +07:00
parent ad7e631bf7
commit e889c93e21
3 changed files with 5 additions and 3 deletions
--- 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_expenditure_report_from_revenue_v2>() { budget };

            Report report = new Report();