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

Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

Browse source
This commit is contained in:
kittapath 2024-10-21 17:38:33 +07:00
commit 4c2188a363
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/controllers/CommandController.ts
View file

@ -2097,6 +2097,9 @@ export class CommandController extends Controller {
refCommandNo?: string | null; refCommandNo?: string | null;
salaryRef?: string | null; salaryRef?: string | null;
commandId?: string | null; commandId?: string | null;
amount?: Double | null;
positionSalaryAmount?: Double | null;
mouthSalaryAmount?: Double | null;
}[]; }[];
}, },
) { ) {
@ -2134,11 +2137,9 @@ export class CommandController extends Controller {
profile.profileSalary.length > 0 ? profile.profileSalary[0].positionPathSide : null, profile.profileSalary.length > 0 ? profile.profileSalary[0].positionPathSide : null,
positionExecutive: positionExecutive:
profile.profileSalary.length > 0 ? profile.profileSalary[0].positionExecutive : null, profile.profileSalary.length > 0 ? profile.profileSalary[0].positionExecutive : null,
amount: profile.profileSalary.length > 0 ? profile.profileSalary[0].amount : null, amount: item.amount ? item.amount : null,
positionSalaryAmount: positionSalaryAmount: item.positionSalaryAmount ? item.positionSalaryAmount : null,
profile.profileSalary.length > 0 ? profile.profileSalary[0].positionSalaryAmount : null, mouthSalaryAmount: item.mouthSalaryAmount ? item.mouthSalaryAmount : null,
mouthSalaryAmount:
profile.profileSalary.length > 0 ? profile.profileSalary[0].mouthSalaryAmount : null,
order: order:
profile.profileSalary.length >= 0 profile.profileSalary.length >= 0
? profile.profileSalary.length > 0 ? profile.profileSalary.length > 0
@ -2177,6 +2178,9 @@ export class CommandController extends Controller {
refCommandNo?: string | null; refCommandNo?: string | null;
salaryRef?: string | null; salaryRef?: string | null;
commandId?: string | null; commandId?: string | null;
amount?: Double | null;
positionSalaryAmount?: Double | null;
mouthSalaryAmount?: Double | null;
}[]; }[];
}, },
) { ) {
@ -2227,11 +2231,9 @@ export class CommandController extends Controller {
profile.profileSalary.length > 0 ? profile.profileSalary[0].positionPathSide : null, profile.profileSalary.length > 0 ? profile.profileSalary[0].positionPathSide : null,
positionExecutive: positionExecutive:
profile.profileSalary.length > 0 ? profile.profileSalary[0].positionExecutive : null, profile.profileSalary.length > 0 ? profile.profileSalary[0].positionExecutive : null,
amount: profile.profileSalary.length > 0 ? profile.profileSalary[0].amount : null, amount: item.amount ? item.amount : null,
positionSalaryAmount: positionSalaryAmount: item.positionSalaryAmount ? item.positionSalaryAmount : null,
profile.profileSalary.length > 0 ? profile.profileSalary[0].positionSalaryAmount : null, mouthSalaryAmount: item.mouthSalaryAmount ? item.mouthSalaryAmount : null,
mouthSalaryAmount:
profile.profileSalary.length > 0 ? profile.profileSalary[0].mouthSalaryAmount : null,
order: order:
profile.profileSalary.length >= 0 profile.profileSalary.length >= 0
? profile.profileSalary.length > 0 ? profile.profileSalary.length > 0