hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 56s
Details

Browse source
This commit is contained in:
Adisak 2025-10-30 18:08:10 +07:00
commit 0e706795f2
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/controllers/ReportController.ts
View file

@ -11222,10 +11222,10 @@ export class ReportController extends Controller {
if (x.type !== tmpType && tmpType != "") { if (x.type !== tmpType && tmpType != "") {
_total = total - x.total; _total = total - x.total;
_reslut.push({ _reslut.push({
type: "", type: "รวม",
typeRank: "", typeRank: "",
typeShortNameAndRank: "", typeShortNameAndRank: "",
level: "รวม", level: "",
levelRank: "", levelRank: "",
total: _total, total: _total,
remark: "", remark: "",
@ -11241,21 +11241,21 @@ export class ReportController extends Controller {
}); });
_reslut.push({ _reslut.push({
type: "", type: "รวม",
typeRank: "", typeRank: "",
typeShortNameAndRank: "", typeShortNameAndRank: "",
level: "รวม", level: "",
levelRank: "", levelRank: "",
total: "รวม" + " " + total, total: total,
remark: "", remark: "",
}); });
_reslut.push({ _reslut.push({
type: "", type: "รวมทั้งสิ้น",
typeRank: "", typeRank: "",
typeShortNameAndRank: "", typeShortNameAndRank: "",
level: "รวมทั้งสิ้น", level: "",
levelRank: "", levelRank: "",
total: "รวมทั้งสิ้น" + " " + allTotal, total: allTotal,
remark: "", remark: "",
}); });