From 89beced8cc9cb141223b639ded75a935ee347d35 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Tue, 13 Feb 2024 09:59:10 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84=E0=B8=B4?= =?UTF-8?q?=E0=B8=A7=E0=B8=A3=E0=B8=B5=E0=B9=88=E0=B8=9A=E0=B8=B1=E0=B8=90?= =?UTF-8?q?=E0=B8=8A=E0=B8=B5=201/2/3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ReportController.ts | 201 +++++++++++++++++++++++++++- 1 file changed, 200 insertions(+), 1 deletion(-) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 1e6b7436..c29dac89 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -182,6 +182,7 @@ export class ReportController extends Controller { positionName: "", posType: "", posLevel: "", + reason: "", }; data.push(head); const _head = { @@ -191,6 +192,7 @@ export class ReportController extends Controller { positionName: node.positionName, posType: node.posType, posLevel: node.posLevel, + reason: "", }; data.push(_head); } else { @@ -207,6 +209,7 @@ export class ReportController extends Controller { positionName: "", posType: "", posLevel: "", + reason: "", }; data.push(head); _node == null; @@ -218,6 +221,7 @@ export class ReportController extends Controller { positionName: node.positionName, posType: node.posType, posLevel: node.posLevel, + reason: "", }; data.push(head); } @@ -267,6 +271,7 @@ export class ReportController extends Controller { posType: posType.join(" หรือ "), posLevel: posLevel.join(" หรือ "), posExecutive: posExecutive.join(" หรือ "), + reason: "", }; if (_node == null) { const head = { @@ -275,6 +280,7 @@ export class ReportController extends Controller { positionName: "", posType: "", posLevel: "", + reason: "", }; data.push(head); const _head = { @@ -284,6 +290,7 @@ export class ReportController extends Controller { positionName: node.positionName, posType: node.posType, posLevel: node.posLevel, + reason: "", }; data.push(_head); } else { @@ -300,6 +307,7 @@ export class ReportController extends Controller { positionName: "", posType: "", posLevel: "", + reason: "", }; data.push(head); _node == null; @@ -312,6 +320,7 @@ export class ReportController extends Controller { positionName: node.positionName, posType: node.posType, posLevel: node.posLevel, + reason: "", }; data.push(head); } @@ -359,10 +368,11 @@ export class ReportController extends Controller { orgTreeName: orgChild2.orgChild2Name, orgTreeShortName: orgChild2.orgChild2ShortName, posMasterNo: posMaster.posMasterNo, + posExecutive: posExecutive.join(" หรือ "), positionName: positionName.join(" หรือ "), posType: posType.join(" หรือ "), posLevel: posLevel.join(" หรือ "), - posExecutive: posExecutive.join(" หรือ "), + reason: "", }; if (_node == null) { const head = { @@ -371,6 +381,7 @@ export class ReportController extends Controller { positionName: "", posType: "", posLevel: "", + reason: "", }; data.push(head); const _head = { @@ -380,6 +391,7 @@ export class ReportController extends Controller { positionName: node.positionName, posType: node.posType, posLevel: node.posLevel, + reason: "", }; data.push(_head); } else { @@ -397,6 +409,7 @@ export class ReportController extends Controller { positionName: "", posType: "", posLevel: "", + reason: "", }; data.push(head); _node == null; @@ -409,6 +422,7 @@ export class ReportController extends Controller { positionName: node.positionName, posType: node.posType, posLevel: node.posLevel, + reason: "", }; data.push(head); } @@ -460,6 +474,7 @@ export class ReportController extends Controller { posType: posType.join(" หรือ "), posLevel: posLevel.join(" หรือ "), posExecutive: posExecutive.join(" หรือ "), + reason: "", }; if (_node == null) { const head = { @@ -468,6 +483,7 @@ export class ReportController extends Controller { positionName: "", posType: "", posLevel: "", + reason: "", }; data.push(head); const _head = { @@ -477,6 +493,7 @@ export class ReportController extends Controller { positionName: node.positionName, posType: node.posType, posLevel: node.posLevel, + reason: "", }; data.push(_head); } else { @@ -494,6 +511,7 @@ export class ReportController extends Controller { positionName: "", posType: "", posLevel: "", + reason: "", }; data.push(head); _node == null; @@ -506,6 +524,7 @@ export class ReportController extends Controller { positionName: node.positionName, posType: node.posType, posLevel: node.posLevel, + reason: "", }; data.push(head); } @@ -556,6 +575,7 @@ export class ReportController extends Controller { posType: posType.join(" หรือ "), posLevel: posLevel.join(" หรือ "), posExecutive: posExecutive.join(" หรือ "), + reason: "", }; if (_node == null) { const head = { @@ -564,6 +584,7 @@ export class ReportController extends Controller { positionName: "", posType: "", posLevel: "", + reason: "", }; data.push(head); const _head = { @@ -573,6 +594,7 @@ export class ReportController extends Controller { positionName: node.positionName, posType: node.posType, posLevel: node.posLevel, + reason: "", }; data.push(_head); } else { @@ -590,6 +612,7 @@ export class ReportController extends Controller { positionName: "", posType: "", posLevel: "", + reason: "", }; data.push(head); _node == null; @@ -602,6 +625,7 @@ export class ReportController extends Controller { positionName: node.positionName, posType: node.posType, posLevel: node.posLevel, + reason: "", }; data.push(head); } @@ -1008,6 +1032,8 @@ export class ReportController extends Controller { : positionMasterProfileOld.positions.find( (x: any) => x.positionIsSelected == true, )?.posExecutive?.posExecutiveName, + education: "", + salary: "", }; if (_node == null) { const head = { @@ -1022,6 +1048,8 @@ export class ReportController extends Controller { profilePositionName: "", profilePosType: "", profilePosLevel: "", + education: "", + salary: "", }; data.push(head); const _head = { @@ -1037,6 +1065,8 @@ export class ReportController extends Controller { profilePositionName: node.profilePositionName, profilePosType: node.profilePosType, profilePosLevel: node.profilePosLevel, + education: "", + salary: "", }; data.push(_head); } else { @@ -1065,6 +1095,8 @@ export class ReportController extends Controller { profilePositionName: "", profilePosType: "", profilePosLevel: "", + education: "", + salary: "", }; data.push(head); _node == null; @@ -1085,6 +1117,8 @@ export class ReportController extends Controller { profilePositionName: node.profilePositionName, profilePosType: node.profilePosType, profilePosLevel: node.profilePosLevel, + education: "", + salary: "", }; data.push(head); } @@ -1288,6 +1322,8 @@ export class ReportController extends Controller { : positionMasterProfileOld.positions.find( (x: any) => x.positionIsSelected == true, )?.posExecutive?.posExecutiveName, + education: "", + salary: "", }; if (_node == null) { const head = { @@ -1302,6 +1338,8 @@ export class ReportController extends Controller { profilePositionName: "", profilePosType: "", profilePosLevel: "", + education: "", + salary: "", }; data.push(head); const _head = { @@ -1317,6 +1355,8 @@ export class ReportController extends Controller { profilePositionName: node.profilePositionName, profilePosType: node.profilePosType, profilePosLevel: node.profilePosLevel, + education: "", + salary: "", }; data.push(_head); } else { @@ -1345,6 +1385,8 @@ export class ReportController extends Controller { profilePositionName: "", profilePosType: "", profilePosLevel: "", + education: "", + salary: "", }; data.push(head); _node == null; @@ -1366,6 +1408,8 @@ export class ReportController extends Controller { profilePositionName: node.profilePositionName, profilePosType: node.profilePosType, profilePosLevel: node.profilePosLevel, + education: "", + salary: "", }; data.push(head); } @@ -1571,6 +1615,8 @@ export class ReportController extends Controller { : positionMasterProfileOld.positions.find( (x: any) => x.positionIsSelected == true, )?.posExecutive?.posExecutiveName, + education: "", + salary: "", }; if (_node == null) { const head = { @@ -1585,6 +1631,8 @@ export class ReportController extends Controller { profilePositionName: "", profilePosType: "", profilePosLevel: "", + education: "", + salary: "", }; data.push(head); const _head = { @@ -1600,6 +1648,8 @@ export class ReportController extends Controller { profilePositionName: node.profilePositionName, profilePosType: node.profilePosType, profilePosLevel: node.profilePosLevel, + education: "", + salary: "", }; data.push(_head); } else { @@ -1629,6 +1679,8 @@ export class ReportController extends Controller { profilePositionName: "", profilePosType: "", profilePosLevel: "", + education: "", + salary: "", }; data.push(head); _node == null; @@ -1650,6 +1702,8 @@ export class ReportController extends Controller { profilePositionName: node.profilePositionName, profilePosType: node.profilePosType, profilePosLevel: node.profilePosLevel, + education: "", + salary: "", }; data.push(head); } @@ -1855,6 +1909,8 @@ export class ReportController extends Controller { : positionMasterProfileOld.positions.find( (x: any) => x.positionIsSelected == true, )?.posExecutive?.posExecutiveName, + education: "", + salary: "", }; if (_node == null) { const head = { @@ -1869,6 +1925,8 @@ export class ReportController extends Controller { profilePositionName: "", profilePosType: "", profilePosLevel: "", + education: "", + salary: "", }; data.push(head); const _head = { @@ -1884,6 +1942,8 @@ export class ReportController extends Controller { profilePositionName: node.profilePositionName, profilePosType: node.profilePosType, profilePosLevel: node.profilePosLevel, + education: "", + salary: "", }; data.push(_head); } else { @@ -1915,6 +1975,8 @@ export class ReportController extends Controller { profilePositionName: "", profilePosType: "", profilePosLevel: "", + education: "", + salary: "", }; data.push(head); _node == null; @@ -1936,6 +1998,8 @@ export class ReportController extends Controller { profilePositionName: node.profilePositionName, profilePosType: node.profilePosType, profilePosLevel: node.profilePosLevel, + education: "", + salary: "", }; data.push(head); } @@ -2140,6 +2204,8 @@ export class ReportController extends Controller { : positionMasterProfileOld.positions.find( (x: any) => x.positionIsSelected == true, )?.posExecutive?.posExecutiveName, + education: "", + salary: "", }; if (_node == null) { const head = { @@ -2154,6 +2220,8 @@ export class ReportController extends Controller { profilePositionName: "", profilePosType: "", profilePosLevel: "", + education: "", + salary: "", }; data.push(head); const _head = { @@ -2169,6 +2237,8 @@ export class ReportController extends Controller { profilePositionName: node.profilePositionName, profilePosType: node.profilePosType, profilePosLevel: node.profilePosLevel, + education: "", + salary: "", }; data.push(_head); } else { @@ -2200,6 +2270,8 @@ export class ReportController extends Controller { profilePositionName: "", profilePosType: "", profilePosLevel: "", + education: "", + salary: "", }; data.push(head); _node == null; @@ -2221,6 +2293,8 @@ export class ReportController extends Controller { profilePositionName: node.profilePositionName, profilePosType: node.profilePosType, profilePosLevel: node.profilePosLevel, + education: "", + salary: "", }; data.push(head); } @@ -2483,6 +2557,11 @@ export class ReportController extends Controller { )?.posExecutive?.posExecutiveName, profileFullname: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`, + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; if (_node == null) { const head = { @@ -2492,6 +2571,11 @@ export class ReportController extends Controller { positionName: "", posType: "", posLevel: "", + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; data.push(head); const _head = { @@ -2502,6 +2586,11 @@ export class ReportController extends Controller { positionName: node.positionName, posType: node.posType, posLevel: node.posLevel, + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; data.push(_head); } else { @@ -2519,6 +2608,11 @@ export class ReportController extends Controller { positionName: "", posType: "", posLevel: "", + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; data.push(head); _node == null; @@ -2531,6 +2625,11 @@ export class ReportController extends Controller { positionName: node.positionName, posType: node.posType, posLevel: node.posLevel, + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; data.push(head); } @@ -2590,6 +2689,11 @@ export class ReportController extends Controller { )?.posExecutive?.posExecutiveName, profileFullname: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`, + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; if (_node == null) { const head = { @@ -2599,6 +2703,11 @@ export class ReportController extends Controller { positionName: "", posType: "", posLevel: "", + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; data.push(head); const _head = { @@ -2609,6 +2718,11 @@ export class ReportController extends Controller { positionName: node.positionName, posType: node.posType, posLevel: node.posLevel, + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; data.push(_head); } else { @@ -2626,6 +2740,11 @@ export class ReportController extends Controller { positionName: "", posType: "", posLevel: "", + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; data.push(head); _node == null; @@ -2639,6 +2758,11 @@ export class ReportController extends Controller { positionName: node.positionName, posType: node.posType, posLevel: node.posLevel, + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; data.push(head); } @@ -2697,6 +2821,11 @@ export class ReportController extends Controller { (x: any) => x.positionIsSelected == true, )?.posExecutive?.posExecutiveName, profileFullname: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`, + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; if (_node == null) { const head = { @@ -2706,6 +2835,11 @@ export class ReportController extends Controller { positionName: "", posType: "", posLevel: "", + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; data.push(head); const _head = { @@ -2716,6 +2850,11 @@ export class ReportController extends Controller { positionName: node.positionName, posType: node.posType, posLevel: node.posLevel, + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; data.push(_head); } else { @@ -2734,6 +2873,11 @@ export class ReportController extends Controller { positionName: "", posType: "", posLevel: "", + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; data.push(head); _node == null; @@ -2747,6 +2891,11 @@ export class ReportController extends Controller { positionName: node.positionName, posType: node.posType, posLevel: node.posLevel, + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; data.push(head); } @@ -2805,6 +2954,11 @@ export class ReportController extends Controller { (x: any) => x.positionIsSelected == true, )?.posExecutive?.posExecutiveName, profileFullname: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`, + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; if (_node == null) { const head = { @@ -2814,6 +2968,11 @@ export class ReportController extends Controller { positionName: "", posType: "", posLevel: "", + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; data.push(head); const _head = { @@ -2824,6 +2983,11 @@ export class ReportController extends Controller { positionName: node.positionName, posType: node.posType, posLevel: node.posLevel, + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; data.push(_head); } else { @@ -2842,6 +3006,11 @@ export class ReportController extends Controller { positionName: "", posType: "", posLevel: "", + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; data.push(head); _node == null; @@ -2855,6 +3024,11 @@ export class ReportController extends Controller { positionName: node.positionName, posType: node.posType, posLevel: node.posLevel, + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; data.push(head); } @@ -2913,6 +3087,11 @@ export class ReportController extends Controller { (x: any) => x.positionIsSelected == true, )?.posExecutive?.posExecutiveName, profileFullname: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`, + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; if (_node == null) { const head = { @@ -2922,6 +3101,11 @@ export class ReportController extends Controller { positionName: "", posType: "", posLevel: "", + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; data.push(head); const _head = { @@ -2932,6 +3116,11 @@ export class ReportController extends Controller { positionName: node.positionName, posType: node.posType, posLevel: node.posLevel, + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; data.push(_head); } else { @@ -2950,6 +3139,11 @@ export class ReportController extends Controller { positionName: "", posType: "", posLevel: "", + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; data.push(head); _node == null; @@ -2963,6 +3157,11 @@ export class ReportController extends Controller { positionName: node.positionName, posType: node.posType, posLevel: node.posLevel, + education: "", + salary: "", + positionSalaryAmount: "", + mouthSalaryAmount: "", + reason: "", }; data.push(head); }