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

space posno

Browse source
This commit is contained in:
mamoss 2025-04-05 19:21:50 +07:00
parent b1b9700e40
commit d9fb4110e3
18 changed files with 1283 additions and 875 deletions
Download patch file Download diff file Expand all files Collapse all files

71
src/controllers/OrganizationUnauthorizeController.ts
View file

@ -252,14 +252,19 @@ export class OrganizationUnauthorizeController extends Controller {
amount: amount ? amount : null,
rootId: item.orgRootId,
root: item.orgRoot?.orgRootName ? item.orgRoot.orgRootName : null,
rootOrder: item.orgRoot?.orgRootOrder ? item.orgRoot.orgRootOrder : null,
child1Id: item.orgChild1Id,
child1: item.orgChild1?.orgChild1Name ? item.orgChild1.orgChild1Name : null,
child1Order: item.orgChild1?.orgChild1Order ? item.orgChild1.orgChild1Order : null,
child2Id: item.orgChild2Id,
child2: item.orgChild2?.orgChild2Name ? item.orgChild2.orgChild2Name : null,
child2Order: item.orgChild2?.orgChild2Order ? item.orgChild2.orgChild2Order : null,
child3Id: item.orgChild3Id,
child3: item.orgChild3?.orgChild3Name ? item.orgChild3.orgChild3Name : null,
child3Order: item.orgChild3?.orgChild3Order ? item.orgChild3.orgChild3Order : null,
child4Id: item.orgChild4Id,
child4: item.orgChild4?.orgChild4Name ? item.orgChild4.orgChild4Name : null,
child4Order: item.orgChild4?.orgChild4Order ? item.orgChild4.orgChild4Order : null,
result: pointSum,
duration: null,
isPunish:
@ -467,14 +472,19 @@ export class OrganizationUnauthorizeController extends Controller {
amount: amount ? amount : null,
rootId: item.orgRootId,
root: item.orgRoot?.orgRootName ? item.orgRoot.orgRootName : null,
rootOrder: item.orgRoot?.orgRootOrder ? item.orgRoot.orgRootOrder : null,
child1Id: item.orgChild1Id,
child1: item.orgChild1?.orgChild1Name ? item.orgChild1.orgChild1Name : null,
child1Order: item.orgChild1?.orgChild1Order ? item.orgChild1.orgChild1Order : null,
child2Id: item.orgChild2Id,
child2: item.orgChild2?.orgChild2Name ? item.orgChild2.orgChild2Name : null,
child2Order: item.orgChild2?.orgChild2Order ? item.orgChild2.orgChild2Order : null,
child3Id: item.orgChild3Id,
child3: item.orgChild3?.orgChild3Name ? item.orgChild3.orgChild3Name : null,
child3Order: item.orgChild3?.orgChild3Order ? item.orgChild3.orgChild3Order : null,
child4Id: item.orgChild4Id,
child4: item.orgChild4?.orgChild4Name ? item.orgChild4.orgChild4Name : null,
child4Order: item.orgChild4?.orgChild4Order ? item.orgChild4.orgChild4Order : null,
result: pointSum,
duration: null,
isPunish:
@ -768,10 +778,10 @@ export class OrganizationUnauthorizeController extends Controller {
: findProfile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4;
let _root = root?.orgRootName;
let _child1 =child1?.orgChild1Name;
let _child2 =child2?.orgChild2Name;
let _child3 =child3?.orgChild3Name;
let _child4 =child4?.orgChild4Name;
let _child1 = child1?.orgChild1Name;
let _child2 = child2?.orgChild2Name;
let _child3 = child3?.orgChild3Name;
let _child4 = child4?.orgChild4Name;
return new HttpSuccess({
rootId: root == null ? null : root.id,
@ -779,11 +789,12 @@ export class OrganizationUnauthorizeController extends Controller {
orgRootShortName: root == null ? null : root.orgRootShortName,
orgRevisionId: findRevision.id,
profileId: findProfile.id,
org: (_child4 == null ? "" : _child4 + "\n") +
(_child3 == null ? "" : _child3 + "\n") +
(_child2 == null ? "" : _child2 + "\n") +
(_child1 == null ? "" : _child1 + "\n") +
(_root == null ? "" : _root),
org:
(_child4 == null ? "" : _child4 + "\n") +
(_child3 == null ? "" : _child3 + "\n") +
(_child2 == null ? "" : _child2 + "\n") +
(_child1 == null ? "" : _child1 + "\n") +
(_root == null ? "" : _root),
type: "OFFICER",
rank: findProfile.rank,
prefix: findProfile.prefix,
@ -864,10 +875,10 @@ export class OrganizationUnauthorizeController extends Controller {
: findProfile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4;
let _root = root?.orgRootName;
let _child1 =child1?.orgChild1Name;
let _child2 =child2?.orgChild2Name;
let _child3 =child3?.orgChild3Name;
let _child4 =child4?.orgChild4Name;
let _child1 = child1?.orgChild1Name;
let _child2 = child2?.orgChild2Name;
let _child3 = child3?.orgChild3Name;
let _child4 = child4?.orgChild4Name;
return new HttpSuccess({
rootId: root == null ? null : root.id,
@ -875,11 +886,12 @@ export class OrganizationUnauthorizeController extends Controller {
orgRootShortName: root == null ? null : root.orgRootShortName,
orgRevisionId: findRevision.id,
profileId: findProfile.id,
org: (_child4 == null ? "" : _child4 + "\n") +
(_child3 == null ? "" : _child3 + "\n") +
(_child2 == null ? "" : _child2 + "\n") +
(_child1 == null ? "" : _child1 + "\n") +
(_root == null ? "" : _root),
org:
(_child4 == null ? "" : _child4 + "\n") +
(_child3 == null ? "" : _child3 + "\n") +
(_child2 == null ? "" : _child2 + "\n") +
(_child1 == null ? "" : _child1 + "\n") +
(_root == null ? "" : _root),
type: "EMPLOYEE",
rank: findProfile.rank,
prefix: findProfile.prefix,
@ -960,10 +972,10 @@ export class OrganizationUnauthorizeController extends Controller {
: findProfile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4;
let _root = root?.orgRootName;
let _child1 =child1?.orgChild1Name;
let _child2 =child2?.orgChild2Name;
let _child3 =child3?.orgChild3Name;
let _child4 =child4?.orgChild4Name;
let _child1 = child1?.orgChild1Name;
let _child2 = child2?.orgChild2Name;
let _child3 = child3?.orgChild3Name;
let _child4 = child4?.orgChild4Name;
return new HttpSuccess({
rootId: root == null ? null : root.id,
@ -971,11 +983,12 @@ export class OrganizationUnauthorizeController extends Controller {
orgRootShortName: root == null ? null : root.orgRootShortName,
orgRevisionId: findRevision.id,
profileId: findProfile.id,
org: (_child4 == null ? "" : _child4 + "\n") +
(_child3 == null ? "" : _child3 + "\n") +
(_child2 == null ? "" : _child2 + "\n") +
(_child1 == null ? "" : _child1 + "\n") +
(_root == null ? "" : _root),
org:
(_child4 == null ? "" : _child4 + "\n") +
(_child3 == null ? "" : _child3 + "\n") +
(_child2 == null ? "" : _child2 + "\n") +
(_child1 == null ? "" : _child1 + "\n") +
(_root == null ? "" : _root),
type: "EMPLOYEE",
rank: findProfile.rank,
prefix: findProfile.prefix,
@ -1072,7 +1085,7 @@ export class OrganizationUnauthorizeController extends Controller {
govAgePlus: profile.govAgePlus,
birthDate: profile.birthDate,
reasonSameDate: profile.reasonSameDate,
telephoneNumber: profile.telephoneNumber,
telephoneNumber: profile.phone,
nationality: profile.nationality,
gender: profile.gender,
relationship: profile.relationship,
@ -1151,7 +1164,7 @@ export class OrganizationUnauthorizeController extends Controller {
govAgePlus: profile.govAgePlus,
birthDate: profile.birthDate,
reasonSameDate: profile.reasonSameDate,
telephoneNumber: profile.telephoneNumber,
telephoneNumber: profile.phone,
nationality: profile.nationality,
gender: profile.gender,
relationship: profile.relationship,