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

Merge branch 'develop' of github.com:Frappet/hrms-api-salary into develop

Browse source
This commit is contained in:
moss 2025-05-01 16:31:33 +07:00
commit fa83d942e8
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/controllers/SalaryPeriodController.ts
View file

@ -2765,6 +2765,7 @@ export class SalaryPeriodController extends Controller {
salaryProfileNew.amountUse = salaryOld == null ? 0 : salaryOld.amountUse; salaryProfileNew.amountUse = salaryOld == null ? 0 : salaryOld.amountUse;
salaryProfileNew.positionSalaryAmount = salaryProfileNew.positionSalaryAmount =
salaryOld == null ? 0 : salaryOld.positionSalaryAmount; salaryOld == null ? 0 : salaryOld.positionSalaryAmount;
salaryProfileNew.remark = salaryOld == null ? null : salaryOld.remark;
salaryProfileNew.isNext = salaryOld == null ? false : salaryOld.isNext; salaryProfileNew.isNext = salaryOld == null ? false : salaryOld.isNext;
salaryProfileNew.isSpecial = salaryOld == null ? false : salaryOld.isSpecial; salaryProfileNew.isSpecial = salaryOld == null ? false : salaryOld.isSpecial;
salaryProfileNew.isReserve = salaryOld == null ? false : salaryOld.isReserve; salaryProfileNew.isReserve = salaryOld == null ? false : salaryOld.isReserve;
@ -2834,6 +2835,11 @@ export class SalaryPeriodController extends Controller {
salaryProfileNew.amountUse = salaryOld == null ? 0 : salaryOld.amountUse; salaryProfileNew.amountUse = salaryOld == null ? 0 : salaryOld.amountUse;
salaryProfileNew.positionSalaryAmount = salaryProfileNew.positionSalaryAmount =
salaryOld == null ? 0 : salaryOld.positionSalaryAmount; salaryOld == null ? 0 : salaryOld.positionSalaryAmount;
salaryProfileNew.positionSalaryDayAmount =
salaryOld == null ? 0 : salaryOld.positionSalaryDayAmount;
salaryProfileNew.positionSalaryAmountPer =
salaryOld == null ? 0 : salaryOld.positionSalaryAmountPer;
salaryProfileNew.remark = salaryOld == null ? null : salaryOld.remark;
salaryProfileNew.isNext = salaryOld == null ? false : salaryOld.isNext; salaryProfileNew.isNext = salaryOld == null ? false : salaryOld.isNext;
salaryProfileNew.isSpecial = salaryOld == null ? false : salaryOld.isSpecial; salaryProfileNew.isSpecial = salaryOld == null ? false : salaryOld.isSpecial;
salaryProfileNew.isReserve = salaryOld == null ? false : salaryOld.isReserve; salaryProfileNew.isReserve = salaryOld == null ? false : salaryOld.isReserve;
@ -3083,7 +3089,9 @@ export class SalaryPeriodController extends Controller {
}), }),
); );
} }
console.log(
`✅✅✅ [SNAPSHOT:${snapshot} เสร็จสิ้น]) ✅✅✅`,
);
return new HttpSuccess(); return new HttpSuccess();
} catch (err) { } catch (err) {
console.error(`❌ error processing employee:`, err); console.error(`❌ error processing employee:`, err);