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/bma-ehr-salary into develop

Browse source
This commit is contained in:
Kittapath 2024-03-06 18:28:48 +07:00
commit a8b09b356d
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/controllers/Report_1_Controller.ts
View file

@ -94,7 +94,12 @@ export class Report_1_Controller extends Controller {
profile: salaryProfile.map((item, index) => ({
no: index+1,
fullname: item.prefix + item.firstName +" "+ item.lastName,
position: item.position + "/" + item.posType,
position: item.position + "/" +
(item.child4==undefined && item.child4==null ? "" : item.child4+"/")+
(item.child3==undefined && item.child3==null ? "" : item.child3+"/")+
(item.child2==undefined && item.child2==null ? "" : item.child2+"/")+
(item.child1==undefined && item.child1==null ? "" : item.child1+"/")+
(item.root==undefined && item.root==null ? "" : item.root),
posLevel: item.posLevel,
orgShortName: item.orgShortName+item.posMasterNo,
amount: item.amount == null ? 0 : item.amount,