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:
Kittapath 2024-04-03 18:59:58 +07:00
parent d94ca5480e
commit 50fc458c3f
1 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/controllers/SalaryPeriodEmployeeController.ts
View file

@ -474,7 +474,15 @@ export class SalaryPeriodEmployeeController extends Controller {
order: { step: "DESC" },
});
//เงินเดือนเกินตาราง
if (salaryRankMax != null && step > salaryRankMax.step) {
if (
salaryRankMax != null &&
step > salaryRankMax.step &&
(salaryFormula == null ||
(salaryFormula != null &&
salaryProfile.amount != null &&
salaryFormula.salaryMax != null &&
salaryFormula.salaryMax > salaryProfile.amount))
) {
group = group + 1;
//เงินเดือนในกลุ่มต่อไป
let salaryRankAmount = await this.salaryRankRepository.findOne({
@ -892,7 +900,15 @@ export class SalaryPeriodEmployeeController extends Controller {
order: { step: "DESC" },
});
//เงินเดือนเกินตาราง
if (salaryRankMax != null && step > salaryRankMax.step) {
if (
salaryRankMax != null &&
step > salaryRankMax.step &&
(salaryFormula == null ||
(salaryFormula != null &&
salaryProfile.amount != null &&
salaryFormula.salaryMax != null &&
salaryFormula.salaryMax > salaryProfile.amount))
) {
group = group + 1;
//เงินเดือนในกลุ่มต่อไป
let salaryRankAmount = await this.salaryRankRepository.findOne({
@ -1415,7 +1431,15 @@ export class SalaryPeriodEmployeeController extends Controller {
order: { step: "DESC" },
});
//เงินเดือนเกินตาราง
if (salaryRankMax != null && step > salaryRankMax.step) {
if (
salaryRankMax != null &&
step > salaryRankMax.step &&
(salaryFormula == null ||
(salaryFormula != null &&
salaryProfile.amount != null &&
salaryFormula.salaryMax != null &&
salaryFormula.salaryMax > salaryProfile.amount))
) {
group = group + 1;
//เงินเดือนในกลุ่มต่อไป
let salaryRankAmount = await this.salaryRankRepository.findOne({