เพิ่มเหตุผล posmaster
This commit is contained in:
Kittapath
parent
7a2ed91612
commit
013ccf60e6
7 changed files with 433 additions and 72 deletions
|
|
@ -27,6 +27,7 @@ import { OrgChild1 } from "../entities/OrgChild1";
|
|||
import { OrgChild2 } from "../entities/OrgChild2";
|
||||
import { OrgChild3 } from "../entities/OrgChild3";
|
||||
import { OrgChild4 } from "../entities/OrgChild4";
|
||||
import Extension from "../interfaces/extension";
|
||||
@Route("api/v1/org/report")
|
||||
@Tags("Report")
|
||||
@Security("bearerAuth")
|
||||
|
|
@ -174,6 +175,7 @@ export class ReportController extends Controller {
|
|||
posType: posType.join(" หรือ "),
|
||||
posLevel: posLevel.join(" หรือ "),
|
||||
posExecutive: posExecutive.join(" หรือ "),
|
||||
reason: posMaster.reason,
|
||||
};
|
||||
if (_node == null) {
|
||||
const head = {
|
||||
|
|
@ -187,12 +189,15 @@ export class ReportController extends Controller {
|
|||
data.push(head);
|
||||
const _head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
posExecutive: node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
posType: node.posType,
|
||||
posLevel: node.posLevel,
|
||||
reason: "",
|
||||
reason: node.reason,
|
||||
};
|
||||
data.push(_head);
|
||||
} else {
|
||||
|
|
@ -214,12 +219,15 @@ export class ReportController extends Controller {
|
|||
}
|
||||
const head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
posExecutive: node.posExecutive == _node.posExecutive ? "" : node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
posType: node.posType,
|
||||
posLevel: node.posLevel,
|
||||
reason: "",
|
||||
reason: node.reason,
|
||||
};
|
||||
data.push(head);
|
||||
}
|
||||
|
|
@ -270,7 +278,7 @@ export class ReportController extends Controller {
|
|||
posType: posType.join(" หรือ "),
|
||||
posLevel: posLevel.join(" หรือ "),
|
||||
posExecutive: posExecutive.join(" หรือ "),
|
||||
reason: "",
|
||||
reason: posMaster.reason,
|
||||
};
|
||||
if (_node == null) {
|
||||
const head = {
|
||||
|
|
@ -284,12 +292,15 @@ export class ReportController extends Controller {
|
|||
data.push(head);
|
||||
const _head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
posExecutive: node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
posType: node.posType,
|
||||
posLevel: node.posLevel,
|
||||
reason: "",
|
||||
reason: node.reason,
|
||||
};
|
||||
data.push(_head);
|
||||
} else {
|
||||
|
|
@ -313,12 +324,15 @@ export class ReportController extends Controller {
|
|||
}
|
||||
const head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
posExecutive: node.posExecutive == _node.posExecutive ? "" : node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
posType: node.posType,
|
||||
posLevel: node.posLevel,
|
||||
reason: "",
|
||||
reason: node.reason,
|
||||
};
|
||||
data.push(head);
|
||||
}
|
||||
|
|
@ -369,7 +383,7 @@ export class ReportController extends Controller {
|
|||
positionName: positionName.join(" หรือ "),
|
||||
posType: posType.join(" หรือ "),
|
||||
posLevel: posLevel.join(" หรือ "),
|
||||
reason: "",
|
||||
reason: posMaster.reason,
|
||||
};
|
||||
if (_node == null) {
|
||||
const head = {
|
||||
|
|
@ -383,12 +397,15 @@ export class ReportController extends Controller {
|
|||
data.push(head);
|
||||
const _head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
posExecutive: node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
posType: node.posType,
|
||||
posLevel: node.posLevel,
|
||||
reason: "",
|
||||
reason: node.reason,
|
||||
};
|
||||
data.push(_head);
|
||||
} else {
|
||||
|
|
@ -412,13 +429,16 @@ export class ReportController extends Controller {
|
|||
}
|
||||
const head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
posExecutive:
|
||||
node.posExecutive == _node.posExecutive ? "" : node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
posType: node.posType,
|
||||
posLevel: node.posLevel,
|
||||
reason: "",
|
||||
reason: node.reason,
|
||||
};
|
||||
data.push(head);
|
||||
}
|
||||
|
|
@ -471,7 +491,7 @@ export class ReportController extends Controller {
|
|||
posType: posType.join(" หรือ "),
|
||||
posLevel: posLevel.join(" หรือ "),
|
||||
posExecutive: posExecutive.join(" หรือ "),
|
||||
reason: "",
|
||||
reason: posMaster.reason,
|
||||
};
|
||||
if (_node == null) {
|
||||
const head = {
|
||||
|
|
@ -485,12 +505,15 @@ export class ReportController extends Controller {
|
|||
data.push(head);
|
||||
const _head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
posExecutive: node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
posType: node.posType,
|
||||
posLevel: node.posLevel,
|
||||
reason: "",
|
||||
reason: node.reason,
|
||||
};
|
||||
data.push(_head);
|
||||
} else {
|
||||
|
|
@ -515,13 +538,16 @@ export class ReportController extends Controller {
|
|||
}
|
||||
const head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
posExecutive:
|
||||
node.posExecutive == _node.posExecutive ? "" : node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
posType: node.posType,
|
||||
posLevel: node.posLevel,
|
||||
reason: "",
|
||||
reason: node.reason,
|
||||
};
|
||||
data.push(head);
|
||||
}
|
||||
|
|
@ -572,7 +598,7 @@ export class ReportController extends Controller {
|
|||
posType: posType.join(" หรือ "),
|
||||
posLevel: posLevel.join(" หรือ "),
|
||||
posExecutive: posExecutive.join(" หรือ "),
|
||||
reason: "",
|
||||
reason: posMaster.reason,
|
||||
};
|
||||
if (_node == null) {
|
||||
const head = {
|
||||
|
|
@ -586,12 +612,15 @@ export class ReportController extends Controller {
|
|||
data.push(head);
|
||||
const _head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
posExecutive: node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
posType: node.posType,
|
||||
posLevel: node.posLevel,
|
||||
reason: "",
|
||||
reason: node.reason,
|
||||
};
|
||||
data.push(_head);
|
||||
} else {
|
||||
|
|
@ -616,13 +645,16 @@ export class ReportController extends Controller {
|
|||
}
|
||||
const head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
posExecutive:
|
||||
node.posExecutive == _node.posExecutive ? "" : node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
posType: node.posType,
|
||||
posLevel: node.posLevel,
|
||||
reason: "",
|
||||
reason: node.reason,
|
||||
};
|
||||
data.push(head);
|
||||
}
|
||||
|
|
@ -1047,13 +1079,16 @@ export class ReportController extends Controller {
|
|||
data.push(head);
|
||||
const _head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
profileFullname: node.profileFullname,
|
||||
posExecutive: node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
posType: node.posType,
|
||||
posLevel: node.posLevel,
|
||||
profilePosMasterNo: node.profilePosMasterNo,
|
||||
profilePosMasterNo: Extension.ToThaiNumber(node.profilePosMasterNo.toString()),
|
||||
profilePosExecutive: node.profilePosExecutive,
|
||||
profilePositionName: node.profilePositionName,
|
||||
profilePosType: node.profilePosType,
|
||||
|
|
@ -1094,13 +1129,16 @@ export class ReportController extends Controller {
|
|||
}
|
||||
const head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
profileFullname: node.profileFullname,
|
||||
posExecutive: node.posExecutive == _node.posExecutive ? "" : node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
posType: node.posType,
|
||||
posLevel: node.posLevel,
|
||||
profilePosMasterNo: node.profilePosMasterNo,
|
||||
profilePosMasterNo: Extension.ToThaiNumber(node.profilePosMasterNo.toString()),
|
||||
profilePosExecutive:
|
||||
node.profilePosExecutive == _node.profilePosExecutive
|
||||
? ""
|
||||
|
|
@ -1335,13 +1373,16 @@ export class ReportController extends Controller {
|
|||
data.push(head);
|
||||
const _head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
profileFullname: node.profileFullname,
|
||||
posExecutive: node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
posType: node.posType,
|
||||
posLevel: node.posLevel,
|
||||
profilePosMasterNo: node.profilePosMasterNo,
|
||||
profilePosMasterNo: Extension.ToThaiNumber(node.profilePosMasterNo.toString()),
|
||||
profilePosExecutive: node.profilePosExecutive,
|
||||
profilePositionName: node.profilePositionName,
|
||||
profilePosType: node.profilePosType,
|
||||
|
|
@ -1384,13 +1425,16 @@ export class ReportController extends Controller {
|
|||
}
|
||||
const head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
profileFullname: node.profileFullname,
|
||||
posExecutive: node.posExecutive == _node.posExecutive ? "" : node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
posType: node.posType,
|
||||
posLevel: node.posLevel,
|
||||
profilePosMasterNo: node.profilePosMasterNo,
|
||||
profilePosMasterNo: Extension.ToThaiNumber(node.profilePosMasterNo.toString()),
|
||||
profilePosExecutive:
|
||||
node.profilePosExecutive == _node.profilePosExecutive
|
||||
? ""
|
||||
|
|
@ -1625,13 +1669,19 @@ export class ReportController extends Controller {
|
|||
data.push(head);
|
||||
const _head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
profileFullname: node.profileFullname,
|
||||
posExecutive: node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
posType: node.posType,
|
||||
posLevel: node.posLevel,
|
||||
profilePosMasterNo: node.profilePosMasterNo,
|
||||
profilePosMasterNo:
|
||||
node.profilePosMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.profilePosMasterNo.toString()),
|
||||
profilePosExecutive: node.profilePosExecutive,
|
||||
profilePositionName: node.profilePositionName,
|
||||
profilePosType: node.profilePosType,
|
||||
|
|
@ -1674,14 +1724,20 @@ export class ReportController extends Controller {
|
|||
}
|
||||
const head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
profileFullname: node.profileFullname,
|
||||
posExecutive:
|
||||
node.posExecutive == _node.posExecutive ? "" : node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
posType: node.posType,
|
||||
posLevel: node.posLevel,
|
||||
profilePosMasterNo: node.profilePosMasterNo,
|
||||
profilePosMasterNo:
|
||||
node.profilePosMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.profilePosMasterNo.toString()),
|
||||
profilePosExecutive:
|
||||
node.profilePosExecutive == _node.profilePosExecutive
|
||||
? ""
|
||||
|
|
@ -1918,13 +1974,19 @@ export class ReportController extends Controller {
|
|||
data.push(head);
|
||||
const _head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
profileFullname: node.profileFullname,
|
||||
posExecutive: node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
posType: node.posType,
|
||||
posLevel: node.posLevel,
|
||||
profilePosMasterNo: node.profilePosMasterNo,
|
||||
profilePosMasterNo:
|
||||
node.profilePosMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.profilePosMasterNo.toString()),
|
||||
profilePosExecutive: node.profilePosExecutive,
|
||||
profilePositionName: node.profilePositionName,
|
||||
profilePosType: node.profilePosType,
|
||||
|
|
@ -1968,14 +2030,20 @@ export class ReportController extends Controller {
|
|||
}
|
||||
const head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
profileFullname: node.profileFullname,
|
||||
posExecutive:
|
||||
node.posExecutive == _node.posExecutive ? "" : node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
posType: node.posType,
|
||||
posLevel: node.posLevel,
|
||||
profilePosMasterNo: node.profilePosMasterNo,
|
||||
profilePosMasterNo:
|
||||
node.profilePosMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.profilePosMasterNo.toString()),
|
||||
profilePosExecutive:
|
||||
node.profilePosExecutive == _node.profilePosExecutive
|
||||
? ""
|
||||
|
|
@ -2211,13 +2279,19 @@ export class ReportController extends Controller {
|
|||
data.push(head);
|
||||
const _head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
profileFullname: node.profileFullname,
|
||||
posExecutive: node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
posType: node.posType,
|
||||
posLevel: node.posLevel,
|
||||
profilePosMasterNo: node.profilePosMasterNo,
|
||||
profilePosMasterNo:
|
||||
node.profilePosMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.profilePosMasterNo.toString()),
|
||||
profilePosExecutive: node.profilePosExecutive,
|
||||
profilePositionName: node.profilePositionName,
|
||||
profilePosType: node.profilePosType,
|
||||
|
|
@ -2261,14 +2335,20 @@ export class ReportController extends Controller {
|
|||
}
|
||||
const head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
profileFullname: node.profileFullname,
|
||||
posExecutive:
|
||||
node.posExecutive == _node.posExecutive ? "" : node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
posType: node.posType,
|
||||
posLevel: node.posLevel,
|
||||
profilePosMasterNo: node.profilePosMasterNo,
|
||||
profilePosMasterNo:
|
||||
node.profilePosMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.profilePosMasterNo.toString()),
|
||||
profilePosExecutive:
|
||||
node.profilePosExecutive == _node.profilePosExecutive
|
||||
? ""
|
||||
|
|
@ -2540,7 +2620,7 @@ export class ReportController extends Controller {
|
|||
salary: "",
|
||||
positionSalaryAmount: "",
|
||||
mouthSalaryAmount: "",
|
||||
reason: "",
|
||||
reason: posMaster.reason,
|
||||
};
|
||||
if (_node == null) {
|
||||
const head = {
|
||||
|
|
@ -2559,7 +2639,10 @@ export class ReportController extends Controller {
|
|||
data.push(head);
|
||||
const _head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
profileFullname: node.profileFullname,
|
||||
posExecutive: node.posExecutive == undefined ? "" : node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
|
|
@ -2569,7 +2652,7 @@ export class ReportController extends Controller {
|
|||
salary: "",
|
||||
positionSalaryAmount: "",
|
||||
mouthSalaryAmount: "",
|
||||
reason: "",
|
||||
reason: node.reason,
|
||||
};
|
||||
data.push(_head);
|
||||
} else {
|
||||
|
|
@ -2596,7 +2679,10 @@ export class ReportController extends Controller {
|
|||
}
|
||||
const head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
profileFullname: node.profileFullname,
|
||||
posExecutive: node.posExecutive == _node.posExecutive ? "" : node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
|
|
@ -2606,7 +2692,7 @@ export class ReportController extends Controller {
|
|||
salary: "",
|
||||
positionSalaryAmount: "",
|
||||
mouthSalaryAmount: "",
|
||||
reason: "",
|
||||
reason: node.reason,
|
||||
};
|
||||
data.push(head);
|
||||
}
|
||||
|
|
@ -2670,7 +2756,7 @@ export class ReportController extends Controller {
|
|||
salary: "",
|
||||
positionSalaryAmount: "",
|
||||
mouthSalaryAmount: "",
|
||||
reason: "",
|
||||
reason: posMaster.reason,
|
||||
};
|
||||
if (_node == null) {
|
||||
const head = {
|
||||
|
|
@ -2689,7 +2775,10 @@ export class ReportController extends Controller {
|
|||
data.push(head);
|
||||
const _head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
profileFullname: node.profileFullname,
|
||||
posExecutive: node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
|
|
@ -2699,7 +2788,7 @@ export class ReportController extends Controller {
|
|||
salary: "",
|
||||
positionSalaryAmount: "",
|
||||
mouthSalaryAmount: "",
|
||||
reason: "",
|
||||
reason: node.reason,
|
||||
};
|
||||
data.push(_head);
|
||||
} else {
|
||||
|
|
@ -2728,7 +2817,10 @@ export class ReportController extends Controller {
|
|||
}
|
||||
const head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
profileFullname: node.profileFullname,
|
||||
posExecutive: node.posExecutive == _node.posExecutive ? "" : node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
|
|
@ -2738,7 +2830,7 @@ export class ReportController extends Controller {
|
|||
salary: "",
|
||||
positionSalaryAmount: "",
|
||||
mouthSalaryAmount: "",
|
||||
reason: "",
|
||||
reason: node.reason,
|
||||
};
|
||||
data.push(head);
|
||||
}
|
||||
|
|
@ -2801,7 +2893,7 @@ export class ReportController extends Controller {
|
|||
salary: "",
|
||||
positionSalaryAmount: "",
|
||||
mouthSalaryAmount: "",
|
||||
reason: "",
|
||||
reason: posMaster.reason,
|
||||
};
|
||||
if (_node == null) {
|
||||
const head = {
|
||||
|
|
@ -2820,7 +2912,10 @@ export class ReportController extends Controller {
|
|||
data.push(head);
|
||||
const _head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
profileFullname: node.profileFullname,
|
||||
posExecutive: node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
|
|
@ -2830,7 +2925,7 @@ export class ReportController extends Controller {
|
|||
salary: "",
|
||||
positionSalaryAmount: "",
|
||||
mouthSalaryAmount: "",
|
||||
reason: "",
|
||||
reason: node.reason,
|
||||
};
|
||||
data.push(_head);
|
||||
} else {
|
||||
|
|
@ -2859,7 +2954,10 @@ export class ReportController extends Controller {
|
|||
}
|
||||
const head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
profileFullname: node.profileFullname,
|
||||
posExecutive:
|
||||
node.posExecutive == _node.posExecutive ? "" : node.posExecutive,
|
||||
|
|
@ -2870,7 +2968,7 @@ export class ReportController extends Controller {
|
|||
salary: "",
|
||||
positionSalaryAmount: "",
|
||||
mouthSalaryAmount: "",
|
||||
reason: "",
|
||||
reason: node.reason,
|
||||
};
|
||||
data.push(head);
|
||||
}
|
||||
|
|
@ -2933,7 +3031,7 @@ export class ReportController extends Controller {
|
|||
salary: "",
|
||||
positionSalaryAmount: "",
|
||||
mouthSalaryAmount: "",
|
||||
reason: "",
|
||||
reason: posMaster.reason,
|
||||
};
|
||||
if (_node == null) {
|
||||
const head = {
|
||||
|
|
@ -2952,7 +3050,10 @@ export class ReportController extends Controller {
|
|||
data.push(head);
|
||||
const _head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
profileFullname: node.profileFullname,
|
||||
posExecutive: node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
|
|
@ -2962,7 +3063,7 @@ export class ReportController extends Controller {
|
|||
salary: "",
|
||||
positionSalaryAmount: "",
|
||||
mouthSalaryAmount: "",
|
||||
reason: "",
|
||||
reason: node.reason,
|
||||
};
|
||||
data.push(_head);
|
||||
} else {
|
||||
|
|
@ -2992,7 +3093,10 @@ export class ReportController extends Controller {
|
|||
}
|
||||
const head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
profileFullname: node.profileFullname,
|
||||
posExecutive:
|
||||
node.posExecutive == _node.posExecutive ? "" : node.posExecutive,
|
||||
|
|
@ -3003,7 +3107,7 @@ export class ReportController extends Controller {
|
|||
salary: "",
|
||||
positionSalaryAmount: "",
|
||||
mouthSalaryAmount: "",
|
||||
reason: "",
|
||||
reason: node.reason,
|
||||
};
|
||||
data.push(head);
|
||||
}
|
||||
|
|
@ -3066,7 +3170,7 @@ export class ReportController extends Controller {
|
|||
salary: "",
|
||||
positionSalaryAmount: "",
|
||||
mouthSalaryAmount: "",
|
||||
reason: "",
|
||||
reason: posMaster.reason,
|
||||
};
|
||||
if (_node == null) {
|
||||
const head = {
|
||||
|
|
@ -3085,7 +3189,10 @@ export class ReportController extends Controller {
|
|||
data.push(head);
|
||||
const _head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
profileFullname: node.profileFullname,
|
||||
posExecutive: node.posExecutive,
|
||||
positionName: node.positionName,
|
||||
|
|
@ -3095,7 +3202,7 @@ export class ReportController extends Controller {
|
|||
salary: "",
|
||||
positionSalaryAmount: "",
|
||||
mouthSalaryAmount: "",
|
||||
reason: "",
|
||||
reason: node.reason,
|
||||
};
|
||||
data.push(_head);
|
||||
} else {
|
||||
|
|
@ -3125,7 +3232,10 @@ export class ReportController extends Controller {
|
|||
}
|
||||
const head = {
|
||||
no: no,
|
||||
posMasterNo: node.posMasterNo,
|
||||
posMasterNo:
|
||||
node.posMasterNo == null
|
||||
? ""
|
||||
: Extension.ToThaiNumber(node.posMasterNo.toString()),
|
||||
profileFullname: node.profileFullname,
|
||||
posExecutive:
|
||||
node.posExecutive == _node.posExecutive ? "" : node.posExecutive,
|
||||
|
|
@ -3136,7 +3246,7 @@ export class ReportController extends Controller {
|
|||
salary: "",
|
||||
positionSalaryAmount: "",
|
||||
mouthSalaryAmount: "",
|
||||
reason: "",
|
||||
reason: node.reason,
|
||||
};
|
||||
data.push(head);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue