Merge branch 'develop' into dev

2025-10-30 18:08:10 +07:00 · 2025-10-30 18:08:10 +07:00 · 0e706795f2
commit 0e706795f2
parent cd3963be5a 31d7902b88
1 changed files with 8 additions and 8 deletions
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@ -11222,10 +11222,10 @@ export class ReportController extends Controller {
        if (x.type !== tmpType && tmpType != "") {
          _total = total - x.total;
          _reslut.push({
-            type: "",
+            type: "รวม",
            typeRank: "",
            typeShortNameAndRank: "",
-            level: "รวม",
+            level: "",
            levelRank: "",
            total: _total,
            remark: "",
@ -11241,21 +11241,21 @@ export class ReportController extends Controller {
    });

    _reslut.push({
-      type: "",
+      type: "รวม",
      typeRank: "",
      typeShortNameAndRank: "",
-      level: "รวม",
+      level: "",
      levelRank: "",
-      total: "รวม" + " " + total,
+      total: total,
      remark: "",
    });
    _reslut.push({
-      type: "",
+      type: "รวมทั้งสิ้น",
      typeRank: "",
      typeShortNameAndRank: "",
-      level: "รวมทั้งสิ้น",
+      level: "",
      levelRank: "",
-      total: "รวมทั้งสิ้น" + " " + allTotal,
+      total: allTotal,
      remark: "",
    });