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

report

Browse source
This commit is contained in:
moss 2025-05-01 17:39:55 +07:00
parent fa83d942e8
commit 3f17faa338
13 changed files with 36 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/controllers/ReportController.ts
View file

@ -3214,7 +3214,8 @@ export class ReportController extends Controller {
const _salaryPeriod = await this.salaryProfileEmployeeRepository.find({
relations: ["salaryOrg", "salaryOrg.salaryPeriod"],
where: {
isNext: false,
type: In(["NONE"]),
// amountSpecial: MoreThan(0),xx
salaryOrg: {
snapshot: "SNAP2",
rootId: rootId,
@ -3505,6 +3506,7 @@ export class ReportController extends Controller {
rootId: rootId,
salaryPeriodId: salaryPeriodId,
},
isGood: true,
type: Not("NONE"),
},
order: {
@ -3901,7 +3903,8 @@ export class ReportController extends Controller {
const _salaryPeriod = await this.salaryProfileEmployeeRepository.find({
relations: ["salaryOrg", "salaryOrg.salaryPeriod"],
where: {
isNext: true,
// isNext: true,
amountSpecial: MoreThan(0),
salaryOrg: {
snapshot: "SNAP2",
rootId: rootId,
@ -4915,8 +4918,8 @@ export class ReportController extends Controller {
const _salaryPeriod = await this.salaryProfileEmployeeRepository.find({
relations: ["salaryOrg", "salaryOrg.salaryPeriod"],
where: {
amountSpecial: Not(IsNull()),
type: Not("NONE"),
amountSpecial: MoreThan(0),
salaryOrg: {
snapshot: "SNAP2",
rootId: rootId,
@ -5101,7 +5104,8 @@ export class ReportController extends Controller {
const _salaryPeriod = await this.salaryProfileEmployeeRepository.find({
relations: ["salaryOrg", "salaryOrg.salaryPeriod"],
where: {
type: "NONE",
type: In(["NONE"]),
// amountSpecial: MoreThan(0),xx
salaryOrg: {
snapshot: "SNAP2",
rootId: rootId,
@ -5573,7 +5577,7 @@ export class ReportController extends Controller {
const _salaryPeriod = await this.salaryProfileEmployeeRepository.find({
relations: ["salaryOrg", "salaryOrg.salaryPeriod"],
where: {
type: Not("NONE"),
isGood: true,
salaryOrg: {
snapshot: "SNAP2",
rootId: rootId,
@ -5858,7 +5862,8 @@ export class ReportController extends Controller {
relations: ["salaryOrg", "salaryOrg.salaryPeriod"],
where: {
isRetired: true,
isNext: false,
type: In(["NONE"]),
// amountSpecial: MoreThan(0),xxx
salaryOrg: {
snapshot: "SNAP2",
rootId: rootId,
@ -6267,8 +6272,8 @@ export class ReportController extends Controller {
const _salaryPeriod = await this.salaryProfileEmployeeRepository.find({
relations: ["salaryOrg", "salaryOrg.salaryPeriod"],
where: {
type: Not(In(["NONE", "PENDING"])),
amountSpecial: 0,
type: In(["NONE"]),
// amountSpecial: MoreThan(0),xxx
salaryOrg: {
snapshot: "SNAP2",
rootId: rootId,
@ -7727,7 +7732,7 @@ export class ReportController extends Controller {
positionSalaryAmount: item.positionSalaryAmount,
}));
return new HttpSuccess(_salaryRank);
return new HttpSuccess(_salaryRank.length);
}
/**