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

แก้เงินเดือน

Browse source
This commit is contained in:
moss 2025-03-31 15:17:35 +07:00
parent 0c6d9ac9c1
commit 0c2bbd44d0
1 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/controllers/SalaryPeriodController.ts
View file

@ -466,26 +466,28 @@ export class SalaryPeriodController extends Controller {
if (salaryRanks != null) { if (salaryRanks != null) {
if (salaryProfile.type == "HAFT") { if (salaryProfile.type == "HAFT") {
if (salaryRanks.salaryHalfSpecial != null && salaryRanks.salaryHalfSpecial > 0) { if (salaryRanks.salaryHalfSpecial != null && salaryRanks.salaryHalfSpecial > 0) {
salaryRanks = await this.salaryRankRepository.findOne({ const _salaryRanks = await this.salaryRankRepository.findOne({
where: { where: {
salaryId: salarys.id, salaryId: salarys.id,
salary: salaryRanks.salaryHalf, salary: salaryRanks.salaryHalf,
isNext: true, isNext: true,
}, },
}); });
salaryRanks = _salaryRanks == null ? salaryRanks : _salaryRanks;
} }
} else if (salaryProfile.type == "FULL") { } else if (salaryProfile.type == "FULL") {
if (salaryRanks.salaryFullSpecial != null && salaryRanks.salaryFullSpecial > 0) { if (salaryRanks.salaryFullSpecial != null && salaryRanks.salaryFullSpecial > 0) {
if (salaryRanks.salaryHalfSpecial == null || salaryRanks.salaryHalfSpecial == 0) { if (salaryRanks.salaryHalfSpecial == null || salaryRanks.salaryHalfSpecial == 0) {
type = "HAFT"; type = "HAFT";
} }
salaryRanks = await this.salaryRankRepository.findOne({ const _salaryRanks = await this.salaryRankRepository.findOne({
where: { where: {
salaryId: salarys.id, salaryId: salarys.id,
salary: salaryRanks.salaryFull, salary: salaryRanks.salaryFull,
isNext: true, isNext: true,
}, },
}); });
salaryRanks = _salaryRanks == null ? salaryRanks : _salaryRanks;
} }
} else if (salaryProfile.type == "FULLHAFT") { } else if (salaryProfile.type == "FULLHAFT") {
if (salaryRanks.salaryFullHalfSpecial != null && salaryRanks.salaryFullHalfSpecial > 0) { if (salaryRanks.salaryFullHalfSpecial != null && salaryRanks.salaryFullHalfSpecial > 0) {
@ -497,13 +499,14 @@ export class SalaryPeriodController extends Controller {
) { ) {
type = "FULL"; type = "FULL";
} }
salaryRanks = await this.salaryRankRepository.findOne({ const _salaryRanks = await this.salaryRankRepository.findOne({
where: { where: {
salaryId: salarys.id, salaryId: salarys.id,
salary: salaryRanks.salaryFullHalf, salary: salaryRanks.salaryFullHalf,
isNext: true, isNext: true,
}, },
}); });
salaryRanks = _salaryRanks == null ? salaryRanks : _salaryRanks;
} }
} }
} else { } else {
@ -931,26 +934,28 @@ export class SalaryPeriodController extends Controller {
if (salaryRanks != null) { if (salaryRanks != null) {
if (salaryProfile.type == "HAFT") { if (salaryProfile.type == "HAFT") {
if (salaryRanks.salaryHalfSpecial != null && salaryRanks.salaryHalfSpecial > 0) { if (salaryRanks.salaryHalfSpecial != null && salaryRanks.salaryHalfSpecial > 0) {
salaryRanks = await this.salaryRankRepository.findOne({ const _salaryRanks = await this.salaryRankRepository.findOne({
where: { where: {
salaryId: salarys.id, salaryId: salarys.id,
salary: salaryRanks.salaryHalf, salary: salaryRanks.salaryHalf,
isNext: true, isNext: true,
}, },
}); });
salaryRanks = _salaryRanks == null ? salaryRanks : _salaryRanks;
} }
} else if (salaryProfile.type == "FULL") { } else if (salaryProfile.type == "FULL") {
if (salaryRanks.salaryFullSpecial != null && salaryRanks.salaryFullSpecial > 0) { if (salaryRanks.salaryFullSpecial != null && salaryRanks.salaryFullSpecial > 0) {
if (salaryRanks.salaryHalfSpecial == null || salaryRanks.salaryHalfSpecial == 0) { if (salaryRanks.salaryHalfSpecial == null || salaryRanks.salaryHalfSpecial == 0) {
type = "HAFT"; type = "HAFT";
} }
salaryRanks = await this.salaryRankRepository.findOne({ const _salaryRanks = await this.salaryRankRepository.findOne({
where: { where: {
salaryId: salarys.id, salaryId: salarys.id,
salary: salaryRanks.salaryFull, salary: salaryRanks.salaryFull,
isNext: true, isNext: true,
}, },
}); });
salaryRanks = _salaryRanks == null ? salaryRanks : _salaryRanks;
} }
} else if (salaryProfile.type == "FULLHAFT") { } else if (salaryProfile.type == "FULLHAFT") {
if (salaryRanks.salaryFullHalfSpecial != null && salaryRanks.salaryFullHalfSpecial > 0) { if (salaryRanks.salaryFullHalfSpecial != null && salaryRanks.salaryFullHalfSpecial > 0) {
@ -962,13 +967,14 @@ export class SalaryPeriodController extends Controller {
) { ) {
type = "FULL"; type = "FULL";
} }
salaryRanks = await this.salaryRankRepository.findOne({ const _salaryRanks = await this.salaryRankRepository.findOne({
where: { where: {
salaryId: salarys.id, salaryId: salarys.id,
salary: salaryRanks.salaryFullHalf, salary: salaryRanks.salaryFullHalf,
isNext: true, isNext: true,
}, },
}); });
salaryRanks = _salaryRanks == null ? salaryRanks : _salaryRanks;
} }
} }
} else { } else {
@ -1382,26 +1388,28 @@ export class SalaryPeriodController extends Controller {
if (salaryRanks != null) { if (salaryRanks != null) {
if (salaryProfile.type == "HAFT") { if (salaryProfile.type == "HAFT") {
if (salaryRanks.salaryHalfSpecial != null && salaryRanks.salaryHalfSpecial > 0) { if (salaryRanks.salaryHalfSpecial != null && salaryRanks.salaryHalfSpecial > 0) {
salaryRanks = await this.salaryRankRepository.findOne({ const _salaryRanks = await this.salaryRankRepository.findOne({
where: { where: {
salaryId: salarys.id, salaryId: salarys.id,
salary: salaryRanks.salaryHalf, salary: salaryRanks.salaryHalf,
isNext: true, isNext: true,
}, },
}); });
salaryRanks = _salaryRanks == null ? salaryRanks : _salaryRanks;
} }
} else if (salaryProfile.type == "FULL") { } else if (salaryProfile.type == "FULL") {
if (salaryRanks.salaryFullSpecial != null && salaryRanks.salaryFullSpecial > 0) { if (salaryRanks.salaryFullSpecial != null && salaryRanks.salaryFullSpecial > 0) {
if (salaryRanks.salaryHalfSpecial == null || salaryRanks.salaryHalfSpecial == 0) { if (salaryRanks.salaryHalfSpecial == null || salaryRanks.salaryHalfSpecial == 0) {
type = "HAFT"; type = "HAFT";
} }
salaryRanks = await this.salaryRankRepository.findOne({ const _salaryRanks = await this.salaryRankRepository.findOne({
where: { where: {
salaryId: salarys.id, salaryId: salarys.id,
salary: salaryRanks.salaryFull, salary: salaryRanks.salaryFull,
isNext: true, isNext: true,
}, },
}); });
salaryRanks = _salaryRanks == null ? salaryRanks : _salaryRanks;
} }
} else if (salaryProfile.type == "FULLHAFT") { } else if (salaryProfile.type == "FULLHAFT") {
if (salaryRanks.salaryFullHalfSpecial != null && salaryRanks.salaryFullHalfSpecial > 0) { if (salaryRanks.salaryFullHalfSpecial != null && salaryRanks.salaryFullHalfSpecial > 0) {
@ -1413,13 +1421,14 @@ export class SalaryPeriodController extends Controller {
) { ) {
type = "FULL"; type = "FULL";
} }
salaryRanks = await this.salaryRankRepository.findOne({ const _salaryRanks = await this.salaryRankRepository.findOne({
where: { where: {
salaryId: salarys.id, salaryId: salarys.id,
salary: salaryRanks.salaryFullHalf, salary: salaryRanks.salaryFullHalf,
isNext: true, isNext: true,
}, },
}); });
salaryRanks = _salaryRanks == null ? salaryRanks : _salaryRanks;
} }
} }
} else { } else {