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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2024-07-03 18:07:10 +07:00
commit 07a58bc1c7
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/controllers/ReportController.ts
View file

@ -1066,7 +1066,7 @@ export class ReportController extends Controller {
where: { where: {
salaryPeriodId: salaryPeriodId, salaryPeriodId: salaryPeriodId,
rootId: rootId, rootId: rootId,
snapshot: "SNAP2", snapshot: "SNAP1",
group: "GROUP1", group: "GROUP1",
}, },
}); });
@ -1074,7 +1074,7 @@ export class ReportController extends Controller {
where: { where: {
salaryPeriodId: salaryPeriodId, salaryPeriodId: salaryPeriodId,
rootId: rootId, rootId: rootId,
snapshot: "SNAP2", snapshot: "SNAP1",
group: "GROUP2", group: "GROUP2",
}, },
}); });
@ -1117,7 +1117,7 @@ export class ReportController extends Controller {
where: { where: {
salaryPeriodId: salaryPeriodIncrease1_APR?.id, salaryPeriodId: salaryPeriodIncrease1_APR?.id,
rootId: rootId, rootId: rootId,
snapshot: "SNAP2", snapshot: "SNAP1",
group: "GROUP1", group: "GROUP1",
}, },
}); });
@ -1125,7 +1125,7 @@ export class ReportController extends Controller {
where: { where: {
salaryPeriodId: salaryPeriodIncrease1_APR?.id, salaryPeriodId: salaryPeriodIncrease1_APR?.id,
rootId: rootId, rootId: rootId,
snapshot: "SNAP2", snapshot: "SNAP1",
group: "GROUP2", group: "GROUP2",
}, },
}); });
@ -1133,7 +1133,7 @@ export class ReportController extends Controller {
where: { where: {
salaryPeriodId: salaryPeriodIncrease1_OCT?.id, salaryPeriodId: salaryPeriodIncrease1_OCT?.id,
rootId: rootId, rootId: rootId,
snapshot: "SNAP2", snapshot: "SNAP1",
group: "GROUP1", group: "GROUP1",
}, },
}); });
@ -1141,7 +1141,7 @@ export class ReportController extends Controller {
where: { where: {
salaryPeriodId: salaryPeriodIncrease1_OCT?.id, salaryPeriodId: salaryPeriodIncrease1_OCT?.id,
rootId: rootId, rootId: rootId,
snapshot: "SNAP2", snapshot: "SNAP1",
group: "GROUP2", group: "GROUP2",
}, },
}); });
@ -1177,7 +1177,7 @@ export class ReportController extends Controller {
where: { where: {
salaryPeriodId: salaryPeriodIncrease2_APR?.id, salaryPeriodId: salaryPeriodIncrease2_APR?.id,
rootId: rootId, rootId: rootId,
snapshot: "SNAP2", snapshot: "SNAP1",
group: "GROUP1", group: "GROUP1",
}, },
}); });
@ -1185,7 +1185,7 @@ export class ReportController extends Controller {
where: { where: {
salaryPeriodId: salaryPeriodIncrease2_APR?.id, salaryPeriodId: salaryPeriodIncrease2_APR?.id,
rootId: rootId, rootId: rootId,
snapshot: "SNAP2", snapshot: "SNAP1",
group: "GROUP2", group: "GROUP2",
}, },
}); });
@ -1193,7 +1193,7 @@ export class ReportController extends Controller {
where: { where: {
salaryPeriodId: salaryPeriodIncrease2_OCT?.id, salaryPeriodId: salaryPeriodIncrease2_OCT?.id,
rootId: rootId, rootId: rootId,
snapshot: "SNAP2", snapshot: "SNAP1",
group: "GROUP1", group: "GROUP1",
}, },
}); });
@ -1201,7 +1201,7 @@ export class ReportController extends Controller {
where: { where: {
salaryPeriodId: salaryPeriodIncrease2_OCT?.id, salaryPeriodId: salaryPeriodIncrease2_OCT?.id,
rootId: rootId, rootId: rootId,
snapshot: "SNAP2", snapshot: "SNAP1",
group: "GROUP2", group: "GROUP2",
}, },
}); });
@ -1375,7 +1375,7 @@ export class ReportController extends Controller {
where: { where: {
salaryPeriodId: salaryPeriod_APR?.id, salaryPeriodId: salaryPeriod_APR?.id,
rootId: rootId, rootId: rootId,
snapshot: "SNAP2", snapshot: "SNAP1",
group: "GROUP1", group: "GROUP1",
}, },
}); });
@ -1383,7 +1383,7 @@ export class ReportController extends Controller {
where: { where: {
salaryPeriodId: salaryPeriod_APR?.id, salaryPeriodId: salaryPeriod_APR?.id,
rootId: rootId, rootId: rootId,
snapshot: "SNAP2", snapshot: "SNAP1",
group: "GROUP2", group: "GROUP2",
}, },
}); });
@ -1433,7 +1433,7 @@ export class ReportController extends Controller {
where: { where: {
salaryPeriodId: salaryPeriodIncrease1_APR?.id, salaryPeriodId: salaryPeriodIncrease1_APR?.id,
rootId: rootId, rootId: rootId,
snapshot: "SNAP2", snapshot: "SNAP1",
group: "GROUP1", group: "GROUP1",
}, },
}); });
@ -1441,7 +1441,7 @@ export class ReportController extends Controller {
where: { where: {
salaryPeriodId: salaryPeriodIncrease1_APR?.id, salaryPeriodId: salaryPeriodIncrease1_APR?.id,
rootId: rootId, rootId: rootId,
snapshot: "SNAP2", snapshot: "SNAP1",
group: "GROUP2", group: "GROUP2",
}, },
}); });
@ -1449,7 +1449,7 @@ export class ReportController extends Controller {
where: { where: {
salaryPeriodId: salaryPeriodIncrease1_OCT?.id, salaryPeriodId: salaryPeriodIncrease1_OCT?.id,
rootId: rootId, rootId: rootId,
snapshot: "SNAP2", snapshot: "SNAP1",
group: "GROUP1", group: "GROUP1",
}, },
}); });
@ -1457,7 +1457,7 @@ export class ReportController extends Controller {
where: { where: {
salaryPeriodId: salaryPeriodIncrease1_OCT?.id, salaryPeriodId: salaryPeriodIncrease1_OCT?.id,
rootId: rootId, rootId: rootId,
snapshot: "SNAP2", snapshot: "SNAP1",
group: "GROUP2", group: "GROUP2",
}, },
}); });
@ -1493,7 +1493,7 @@ export class ReportController extends Controller {
where: { where: {
salaryPeriodId: salaryPeriodIncrease2_APR?.id, salaryPeriodId: salaryPeriodIncrease2_APR?.id,
rootId: rootId, rootId: rootId,
snapshot: "SNAP2", snapshot: "SNAP1",
group: "GROUP1", group: "GROUP1",
}, },
}); });
@ -1501,7 +1501,7 @@ export class ReportController extends Controller {
where: { where: {
salaryPeriodId: salaryPeriodIncrease2_APR?.id, salaryPeriodId: salaryPeriodIncrease2_APR?.id,
rootId: rootId, rootId: rootId,
snapshot: "SNAP2", snapshot: "SNAP1",
group: "GROUP2", group: "GROUP2",
}, },
}); });
@ -1509,7 +1509,7 @@ export class ReportController extends Controller {
where: { where: {
salaryPeriodId: salaryPeriodIncrease2_OCT?.id, salaryPeriodId: salaryPeriodIncrease2_OCT?.id,
rootId: rootId, rootId: rootId,
snapshot: "SNAP2", snapshot: "SNAP1",
group: "GROUP1", group: "GROUP1",
}, },
}); });
@ -1517,7 +1517,7 @@ export class ReportController extends Controller {
where: { where: {
salaryPeriodId: salaryPeriodIncrease2_OCT?.id, salaryPeriodId: salaryPeriodIncrease2_OCT?.id,
rootId: rootId, rootId: rootId,
snapshot: "SNAP2", snapshot: "SNAP1",
group: "GROUP2", group: "GROUP2",
}, },
}); });
@ -1866,7 +1866,7 @@ export class ReportController extends Controller {
salaryPeriodId: salaryPeriodId, salaryPeriodId: salaryPeriodId,
}, },
type: In(["HAFT", "FULL", "FULLHAFT"]), type: In(["HAFT", "FULL", "FULLHAFT"]),
// isRetired: true, //กรองเฉพาะคนที่เกษียณ isRetired: true, //กรองเฉพาะคนที่เกษียณ
}, },
order: { order: {
salaryOrg: { salaryOrg: {