From 07f3801084a631b6d1223f593e7cc86ec179a8d3 Mon Sep 17 00:00:00 2001 From: mamoss <> Date: Tue, 13 May 2025 16:56:06 +0700 Subject: [PATCH] return data --- src/controllers/ProfileEmployeeController.ts | 190 +++++++++---------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index e63c266e..39876e62 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -3355,106 +3355,106 @@ export class ProfileEmployeeController extends Controller { let _child3 = child3?.orgChild3Name; let _child4 = child4?.orgChild4Name; return { - // id: _data.id, - // avatar: _data.avatar, - // avatarName: _data.avatarName, - // prefix: _data.prefix, - // rank: _data.rank, - // firstName: _data.firstName, - // lastName: _data.lastName, - // citizenId: _data.citizenId, - // posLevel: _data.posLevel == null ? null : _data.posLevel.posLevelName, - // posType: _data.posType == null ? null : _data.posType.posTypeName, - // posTypeShortName: _data.posType == null ? null : _data.posType.posTypeShortName, + id: _data.id, + avatar: _data.avatar, + avatarName: _data.avatarName, + prefix: _data.prefix, + rank: _data.rank, + firstName: _data.firstName, + lastName: _data.lastName, + citizenId: _data.citizenId, + posLevel: _data.posLevel == null ? null : _data.posLevel.posLevelName, + posType: _data.posType == null ? null : _data.posType.posTypeName, + posTypeShortName: _data.posType == null ? null : _data.posType.posTypeShortName, - // posLevelTemp: _data.posLevelNameTemp, - // posTypeTemp: _data.posTypeNameTemp, - // posTypeShortNameTemp: _data.posTypeShortNameTemp, + posLevelTemp: _data.posLevelNameTemp, + posTypeTemp: _data.posTypeNameTemp, + posTypeShortNameTemp: _data.posTypeShortNameTemp, - // posLevelId: _data.posLevel == null ? null : _data.posLevel.id, - // posTypeId: _data.posType == null ? null : _data.posType.id, - // positionId: _data.positionIdTemp, - // posmasterId: _data.posmasterIdTemp, + posLevelId: _data.posLevel == null ? null : _data.posLevel.id, + posTypeId: _data.posType == null ? null : _data.posType.id, + positionId: _data.positionIdTemp, + posmasterId: _data.posmasterIdTemp, - // position: _data.position, - // positionTemp: _data.positionTemp, + position: _data.position, + positionTemp: _data.positionTemp, posNo: _data.employeeClass == "TEMP" ? _data.posMasterNoTemp : shortName, - // employeeClass: _data.employeeClass == null ? null : _data.employeeClass, - // govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0), - // age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0), - // dateEmployment: dateEmployment, - // dateAppoint: _data.dateAppoint, - // dateStart: _data.dateStart, - // createdAt: _data.createdAt, - // dateRetireLaw: _data.dateRetireLaw, - // draftOrganizationOrganization: - // _data.nodeTemp == "0" - // ? _data.rootTemp - // : _data.nodeTemp == "1" - // ? _data.child1Temp - // : _data.nodeTemp == "2" - // ? _data.child2Temp - // : _data.nodeTemp == "3" - // ? _data.child3Temp - // : _data.nodeTemp == "4" - // ? _data.child4Temp - // : null, - // draftPositionEmployee: _data.positionTemp, - // draftOrgEmployeeStatus: _data.statusTemp, - // node: _data.nodeTemp, - // nodeId: _data.nodeIdTemp, - // nodeName: - // _data.nodeTemp == "0" - // ? _data.rootTemp - // : _data.nodeTemp == "1" - // ? _data.child1Temp - // : _data.nodeTemp == "2" - // ? _data.child2Temp - // : _data.nodeTemp == "3" - // ? _data.child3Temp - // : _data.nodeTemp == "4" - // ? _data.child4Temp - // : null, - // nodeShortName: - // _data.nodeTemp == "0" - // ? _data.rootShortNameTemp - // : _data.nodeTemp == "1" - // ? _data.child1ShortNameTemp - // : _data.nodeTemp == "2" - // ? _data.child1ShortNameTemp - // : _data.nodeTemp == "3" - // ? _data.child3ShortNameTemp - // : _data.nodeTemp == "4" - // ? _data.child4ShortNameTemp - // : null, - // root: _data.rootTemp ? _data.rootTemp : null, - // rootId: _data.rootIdTemp ? _data.rootIdTemp : null, - // rootShortName: _data.rootShortNameTemp ? _data.rootShortNameTemp : null, - // child1: _data.child1Temp ? _data.child1Temp : null, - // child1Id: _data.child1IdTemp ? _data.child1IdTemp : null, - // child1ShortName: _data.child1ShortNameTemp ? _data.child1ShortNameTemp : null, - // child2: _data.child2Temp ? _data.child2Temp : null, - // child2Id: _data.child2IdTemp ? _data.child2IdTemp : null, - // child2ShortName: _data.child2ShortNameTemp ? _data.child2ShortNameTemp : null, - // child3: _data.child3Temp ? _data.child3Temp : null, - // child3Id: _data.child3IdTemp ? _data.child3IdTemp : null, - // child3ShortName: _data.child3ShortNameTemp ? _data.child3ShortNameTemp : null, - // child4: _data.child4Temp ? _data.child4Temp : null, - // child4Id: _data.child4IdTemp ? _data.child4IdTemp : null, - // child4ShortName: _data.child4ShortNameTemp ? _data.child4ShortNameTemp : null, - // org: - // (_child4 == null ? "" : _child4 + "\n") + - // (_child3 == null ? "" : _child3 + "\n") + - // (_child2 == null ? "" : _child2 + "\n") + - // (_child1 == null ? "" : _child1 + "\n") + - // (_root == null ? "" : _root), - // orgTemp: - // (_data.child4Temp == null ? "" : _data.child4Temp + "\n") + - // (_data.child3Temp == null ? "" : _data.child3Temp + "\n") + - // (_data.child2Temp == null ? "" : _data.child2Temp + "\n") + - // (_data.child1Temp == null ? "" : _data.child1Temp + "\n") + - // (_data.rootTemp == null ? "" : _data.rootTemp), + employeeClass: _data.employeeClass == null ? null : _data.employeeClass, + govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0), + age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0), + dateEmployment: dateEmployment, + dateAppoint: _data.dateAppoint, + dateStart: _data.dateStart, + createdAt: _data.createdAt, + dateRetireLaw: _data.dateRetireLaw, + draftOrganizationOrganization: + _data.nodeTemp == "0" + ? _data.rootTemp + : _data.nodeTemp == "1" + ? _data.child1Temp + : _data.nodeTemp == "2" + ? _data.child2Temp + : _data.nodeTemp == "3" + ? _data.child3Temp + : _data.nodeTemp == "4" + ? _data.child4Temp + : null, + draftPositionEmployee: _data.positionTemp, + draftOrgEmployeeStatus: _data.statusTemp, + node: _data.nodeTemp, + nodeId: _data.nodeIdTemp, + nodeName: + _data.nodeTemp == "0" + ? _data.rootTemp + : _data.nodeTemp == "1" + ? _data.child1Temp + : _data.nodeTemp == "2" + ? _data.child2Temp + : _data.nodeTemp == "3" + ? _data.child3Temp + : _data.nodeTemp == "4" + ? _data.child4Temp + : null, + nodeShortName: + _data.nodeTemp == "0" + ? _data.rootShortNameTemp + : _data.nodeTemp == "1" + ? _data.child1ShortNameTemp + : _data.nodeTemp == "2" + ? _data.child1ShortNameTemp + : _data.nodeTemp == "3" + ? _data.child3ShortNameTemp + : _data.nodeTemp == "4" + ? _data.child4ShortNameTemp + : null, + root: _data.rootTemp ? _data.rootTemp : null, + rootId: _data.rootIdTemp ? _data.rootIdTemp : null, + rootShortName: _data.rootShortNameTemp ? _data.rootShortNameTemp : null, + child1: _data.child1Temp ? _data.child1Temp : null, + child1Id: _data.child1IdTemp ? _data.child1IdTemp : null, + child1ShortName: _data.child1ShortNameTemp ? _data.child1ShortNameTemp : null, + child2: _data.child2Temp ? _data.child2Temp : null, + child2Id: _data.child2IdTemp ? _data.child2IdTemp : null, + child2ShortName: _data.child2ShortNameTemp ? _data.child2ShortNameTemp : null, + child3: _data.child3Temp ? _data.child3Temp : null, + child3Id: _data.child3IdTemp ? _data.child3IdTemp : null, + child3ShortName: _data.child3ShortNameTemp ? _data.child3ShortNameTemp : null, + child4: _data.child4Temp ? _data.child4Temp : null, + child4Id: _data.child4IdTemp ? _data.child4IdTemp : null, + child4ShortName: _data.child4ShortNameTemp ? _data.child4ShortNameTemp : null, + org: + (_child4 == null ? "" : _child4 + "\n") + + (_child3 == null ? "" : _child3 + "\n") + + (_child2 == null ? "" : _child2 + "\n") + + (_child1 == null ? "" : _child1 + "\n") + + (_root == null ? "" : _root), + orgTemp: + (_data.child4Temp == null ? "" : _data.child4Temp + "\n") + + (_data.child3Temp == null ? "" : _data.child3Temp + "\n") + + (_data.child2Temp == null ? "" : _data.child2Temp + "\n") + + (_data.child1Temp == null ? "" : _data.child1Temp + "\n") + + (_data.rootTemp == null ? "" : _data.rootTemp), }; }), );