From f82231c84be2c31bf4c08a0a8c39b807e11be443 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Mon, 4 Mar 2024 14:09:54 +0700 Subject: [PATCH] no message --- src/controllers/SalaryPeriodController.ts | 84 ++++++++++++++++------- 1 file changed, 60 insertions(+), 24 deletions(-) diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts index 6372b42..617a9eb 100644 --- a/src/controllers/SalaryPeriodController.ts +++ b/src/controllers/SalaryPeriodController.ts @@ -196,7 +196,7 @@ export class SalaryPeriodController extends Controller { @Post("change/amount") async changeAmount(@Body() body: { profileId: string; amount: number }) { const salaryProfile = await this.salaryProfileRepository.findOne({ - relations: ["salaryOrg","salaryOrg.salaryPeriod"], + relations: ["salaryOrg", "salaryOrg.salaryPeriod"], where: { id: body.profileId }, }); if (!salaryProfile) { @@ -246,13 +246,16 @@ export class SalaryPeriodController extends Controller { if (salaryProfile.type == "NONE") { salaryProfile.amountSpecial = 0; salaryProfile.amountUse = 0; - salaryProfile.positionSalaryAmount = salaryProfile.amount; + salaryProfile.positionSalaryAmount = salaryProfile.amount == null ? 0 : salaryProfile.amount; } else if (salaryProfile.type == "PENDING") { salaryProfile.amountSpecial = 0; salaryProfile.amountUse = 0; salaryProfile.positionSalaryAmount = 0; } else if (salaryProfile.type == "HAFT") { - salaryProfile.amountSpecial = salaryRanks == null ? 0 : salaryRanks.salaryHalfSpecial; + salaryProfile.amountSpecial = + salaryRanks == null || salaryRanks.salaryHalfSpecial == null + ? 0 + : salaryRanks.salaryHalfSpecial; salaryProfile.amountUse = salaryRanks == null || salaryProfile == null || @@ -260,9 +263,13 @@ export class SalaryPeriodController extends Controller { salaryProfile.amount == null ? 0 : salaryRanks.salaryHalf - salaryProfile.amount; - salaryProfile.positionSalaryAmount = salaryRanks == null ? 0 : salaryRanks.salaryHalf; + salaryProfile.positionSalaryAmount = + salaryRanks == null || salaryRanks.salaryHalf == null ? 0 : salaryRanks.salaryHalf; } else if (salaryProfile.type == "FULL") { - salaryProfile.amountSpecial = salaryRanks == null ? 0 : salaryRanks.salaryFullSpecial; + salaryProfile.amountSpecial = + salaryRanks == null || salaryRanks.salaryFullSpecial == null + ? 0 + : salaryRanks.salaryFullSpecial; salaryProfile.amountUse = salaryRanks == null || salaryProfile == null || @@ -270,9 +277,13 @@ export class SalaryPeriodController extends Controller { salaryProfile.amount == null ? 0 : salaryRanks.salaryFull - salaryProfile.amount; - salaryProfile.positionSalaryAmount = salaryRanks == null ? 0 : salaryRanks.salaryFull; + salaryProfile.positionSalaryAmount = + salaryRanks == null || salaryRanks.salaryFull == null ? 0 : salaryRanks.salaryFull; } else if (salaryProfile.type == "FULLHAFT") { - salaryProfile.amountSpecial = salaryRanks == null ? 0 : salaryRanks.salaryFullHalfSpecial; + salaryProfile.amountSpecial = + salaryRanks == null || salaryRanks.salaryFullHalfSpecial == null + ? 0 + : salaryRanks.salaryFullHalfSpecial; salaryProfile.amountUse = salaryRanks == null || salaryProfile == null || @@ -280,7 +291,8 @@ export class SalaryPeriodController extends Controller { salaryProfile.amount == null ? 0 : salaryRanks.salaryFullHalf - salaryProfile.amount; - salaryProfile.positionSalaryAmount = salaryRanks == null ? 0 : salaryRanks.salaryFullHalf; + salaryProfile.positionSalaryAmount = + salaryRanks == null || salaryRanks.salaryFullHalf == null ? 0 : salaryRanks.salaryFullHalf; } else { throw new HttpError(HttpStatusCode.NOT_FOUND, "ประเภทการเลื่อนขึ้นเงินเดือนไม่ถูกต้อง"); } @@ -330,14 +342,14 @@ export class SalaryPeriodController extends Controller { @Post("change/group") async changeGroup(@Body() body: { profileId: string; groupId: string }) { const salaryProfile = await this.salaryProfileRepository.findOne({ - relations: ["salaryOrg","salaryOrg.salaryPeriod"], + relations: ["salaryOrg", "salaryOrg.salaryPeriod"], where: { id: body.profileId }, }); if (!salaryProfile) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการขอเงินเดือนผู้ใช้งานนี้ในระบบ"); } const salaryOrg = await this.salaryOrgRepository.findOne({ - relations:["salaryPeriod"], + relations: ["salaryPeriod"], where: { id: body.groupId }, }); if (!salaryOrg) { @@ -444,7 +456,10 @@ export class SalaryPeriodController extends Controller { salaryProfile.amountUse = 0; salaryProfile.positionSalaryAmount = 0; } else if (body.type == "HAFT") { - salaryProfile.amountSpecial = salaryRanks == null ? 0 : salaryRanks.salaryHalfSpecial; + salaryProfile.amountSpecial = + salaryRanks == null || salaryRanks.salaryHalfSpecial == null + ? 0 + : salaryRanks.salaryHalfSpecial; salaryProfile.amountUse = salaryRanks == null || salaryProfile == null || @@ -452,9 +467,13 @@ export class SalaryPeriodController extends Controller { salaryProfile.amount == null ? 0 : salaryRanks.salaryHalf - salaryProfile.amount; - salaryProfile.positionSalaryAmount = salaryRanks == null ? 0 : salaryRanks.salaryHalf; + salaryProfile.positionSalaryAmount = + salaryRanks == null || salaryRanks.salaryHalf == null ? 0 : salaryRanks.salaryHalf; } else if (body.type == "FULL") { - salaryProfile.amountSpecial = salaryRanks == null ? 0 : salaryRanks.salaryFullSpecial; + salaryProfile.amountSpecial = + salaryRanks == null || salaryRanks.salaryFullSpecial == null + ? 0 + : salaryRanks.salaryFullSpecial; salaryProfile.amountUse = salaryRanks == null || salaryProfile == null || @@ -462,9 +481,13 @@ export class SalaryPeriodController extends Controller { salaryProfile.amount == null ? 0 : salaryRanks.salaryFull - salaryProfile.amount; - salaryProfile.positionSalaryAmount = salaryRanks == null ? 0 : salaryRanks.salaryFull; + salaryProfile.positionSalaryAmount = + salaryRanks == null || salaryRanks.salaryFull == null ? 0 : salaryRanks.salaryFull; } else if (body.type == "FULLHAFT") { - salaryProfile.amountSpecial = salaryRanks == null ? 0 : salaryRanks.salaryFullHalfSpecial; + salaryProfile.amountSpecial = + salaryRanks == null || salaryRanks.salaryFullHalfSpecial == null + ? 0 + : salaryRanks.salaryFullHalfSpecial; salaryProfile.amountUse = salaryRanks == null || salaryProfile == null || @@ -472,7 +495,8 @@ export class SalaryPeriodController extends Controller { salaryProfile.amount == null ? 0 : salaryRanks.salaryFullHalf - salaryProfile.amount; - salaryProfile.positionSalaryAmount = salaryRanks == null ? 0 : salaryRanks.salaryFullHalf; + salaryProfile.positionSalaryAmount = + salaryRanks == null || salaryRanks.salaryFullHalf == null ? 0 : salaryRanks.salaryFullHalf; } else { throw new HttpError(HttpStatusCode.NOT_FOUND, "ประเภทการเลื่อนขึ้นเงินเดือนไม่ถูกต้อง"); } @@ -566,7 +590,7 @@ export class SalaryPeriodController extends Controller { @Request() request: { user: Record }, ) { const salaryOrg = await this.salaryOrgRepository.findOne({ - relations:["salaryPeriod"], + relations: ["salaryPeriod"], where: { id: requestBody.id, }, @@ -646,13 +670,16 @@ export class SalaryPeriodController extends Controller { if (salaryProfile.type == "NONE") { salaryProfile.amountSpecial = 0; salaryProfile.amountUse = 0; - salaryProfile.positionSalaryAmount = salaryProfile.amount; + salaryProfile.positionSalaryAmount = salaryProfile.amount == null ? 0 : salaryProfile.amount; } else if (salaryProfile.type == "PENDING") { salaryProfile.amountSpecial = 0; salaryProfile.amountUse = 0; salaryProfile.positionSalaryAmount = 0; } else if (salaryProfile.type == "HAFT") { - salaryProfile.amountSpecial = salaryRanks == null ? 0 : salaryRanks.salaryHalfSpecial; + salaryProfile.amountSpecial = + salaryRanks == null || salaryRanks.salaryHalfSpecial == null + ? 0 + : salaryRanks.salaryHalfSpecial; salaryProfile.amountUse = salaryRanks == null || salaryProfile == null || @@ -660,9 +687,13 @@ export class SalaryPeriodController extends Controller { salaryProfile.amount == null ? 0 : salaryRanks.salaryHalf - salaryProfile.amount; - salaryProfile.positionSalaryAmount = salaryRanks == null ? 0 : salaryRanks.salaryHalf; + salaryProfile.positionSalaryAmount = + salaryRanks == null || salaryRanks.salaryHalf == null ? 0 : salaryRanks.salaryHalf; } else if (salaryProfile.type == "FULL") { - salaryProfile.amountSpecial = salaryRanks == null ? 0 : salaryRanks.salaryFullSpecial; + salaryProfile.amountSpecial = + salaryRanks == null || salaryRanks.salaryFullSpecial == null + ? 0 + : salaryRanks.salaryFullSpecial; salaryProfile.amountUse = salaryRanks == null || salaryProfile == null || @@ -670,9 +701,13 @@ export class SalaryPeriodController extends Controller { salaryProfile.amount == null ? 0 : salaryRanks.salaryFull - salaryProfile.amount; - salaryProfile.positionSalaryAmount = salaryRanks == null ? 0 : salaryRanks.salaryFull; + salaryProfile.positionSalaryAmount = + salaryRanks == null || salaryRanks.salaryFull == null ? 0 : salaryRanks.salaryFull; } else if (salaryProfile.type == "FULLHAFT") { - salaryProfile.amountSpecial = salaryRanks == null ? 0 : salaryRanks.salaryFullHalfSpecial; + salaryProfile.amountSpecial = + salaryRanks == null || salaryRanks.salaryFullHalfSpecial == null + ? 0 + : salaryRanks.salaryFullHalfSpecial; salaryProfile.amountUse = salaryRanks == null || salaryProfile == null || @@ -680,7 +715,8 @@ export class SalaryPeriodController extends Controller { salaryProfile.amount == null ? 0 : salaryRanks.salaryFullHalf - salaryProfile.amount; - salaryProfile.positionSalaryAmount = salaryRanks == null ? 0 : salaryRanks.salaryFullHalf; + salaryProfile.positionSalaryAmount = + salaryRanks == null || salaryRanks.salaryFullHalf == null ? 0 : salaryRanks.salaryFullHalf; } else { salaryProfile.amountSpecial = 0; salaryProfile.amountUse = 0;