Merge branch 'dev' into adiDev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m7s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m7s
This commit is contained in:
commit
6319f7206a
11 changed files with 102 additions and 0 deletions
|
|
@ -74,6 +74,7 @@ export class OrgChild1Controller {
|
|||
DIVISION_CODE: orgChild1.DIVISION_CODE,
|
||||
SECTION_CODE: orgChild1.SECTION_CODE,
|
||||
JOB_CODE: orgChild1.JOB_CODE,
|
||||
CHILD1_CODE: orgChild1.CHILD1_CODE,
|
||||
orgCode: orgChild1.orgRoot.orgRootCode + orgChild1.orgChild1Code,
|
||||
};
|
||||
return new HttpSuccess(getOrgChild1);
|
||||
|
|
@ -346,6 +347,7 @@ export class OrgChild1Controller {
|
|||
DIVISION_CODE: requestBody.DIVISION_CODE != null ? requestBody.DIVISION_CODE : _null,
|
||||
SECTION_CODE: requestBody.SECTION_CODE != null ? requestBody.SECTION_CODE : _null,
|
||||
JOB_CODE: requestBody.JOB_CODE != null ? requestBody.JOB_CODE : _null,
|
||||
CHILD1_CODE: requestBody.CHILD1_CODE != null ? requestBody.CHILD1_CODE : _null,
|
||||
isOfficer: requestBody.isOfficer,
|
||||
isInformation: requestBody.isInformation,
|
||||
orgChild1PhoneEx: requestBody.orgChild1PhoneEx,
|
||||
|
|
|
|||
|
|
@ -85,6 +85,7 @@ export class OrgChild2Controller extends Controller {
|
|||
DIVISION_CODE: orgChild2.DIVISION_CODE,
|
||||
SECTION_CODE: orgChild2.SECTION_CODE,
|
||||
JOB_CODE: orgChild2.JOB_CODE,
|
||||
CHILD2_CODE: orgChild2.CHILD2_CODE,
|
||||
orgCode: orgChild2.orgRoot.orgRootCode + orgChild2.orgChild2Code,
|
||||
};
|
||||
return new HttpSuccess(getOrgChild2);
|
||||
|
|
@ -252,6 +253,7 @@ export class OrgChild2Controller extends Controller {
|
|||
DIVISION_CODE: requestBody.DIVISION_CODE != null ? requestBody.DIVISION_CODE : _null,
|
||||
SECTION_CODE: requestBody.SECTION_CODE != null ? requestBody.SECTION_CODE : _null,
|
||||
JOB_CODE: requestBody.JOB_CODE != null ? requestBody.JOB_CODE : _null,
|
||||
CHILD2_CODE: requestBody.CHILD2_CODE != null ? requestBody.CHILD2_CODE : _null,
|
||||
orgChild2PhoneEx: requestBody.orgChild2PhoneEx,
|
||||
orgChild2PhoneIn: requestBody.orgChild2PhoneIn,
|
||||
orgChild2Fax: requestBody.orgChild2Fax,
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@ export class OrgChild3Controller {
|
|||
DIVISION_CODE: orgChild3.DIVISION_CODE,
|
||||
SECTION_CODE: orgChild3.SECTION_CODE,
|
||||
JOB_CODE: orgChild3.JOB_CODE,
|
||||
CHILD3_CODE: orgChild3.CHILD3_CODE,
|
||||
orgCode: orgChild3.orgRoot.orgRootCode + orgChild3.orgChild3Code,
|
||||
};
|
||||
return new HttpSuccess(getOrgChild3);
|
||||
|
|
@ -207,6 +208,7 @@ export class OrgChild3Controller {
|
|||
DIVISION_CODE: requestBody.DIVISION_CODE != null ? requestBody.DIVISION_CODE : _null,
|
||||
SECTION_CODE: requestBody.SECTION_CODE != null ? requestBody.SECTION_CODE : _null,
|
||||
JOB_CODE: requestBody.JOB_CODE != null ? requestBody.JOB_CODE : _null,
|
||||
CHILD3_CODE: requestBody.CHILD3_CODE != null ? requestBody.CHILD3_CODE : _null,
|
||||
orgChild3PhoneEx: requestBody.orgChild3PhoneEx,
|
||||
orgChild3PhoneIn: requestBody.orgChild3PhoneIn,
|
||||
orgChild3Fax: requestBody.orgChild3Fax,
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ export class OrgChild4Controller extends Controller {
|
|||
DIVISION_CODE: orgChild4.DIVISION_CODE,
|
||||
SECTION_CODE: orgChild4.SECTION_CODE,
|
||||
JOB_CODE: orgChild4.JOB_CODE,
|
||||
CHILD4_CODE: orgChild4.CHILD4_CODE,
|
||||
orgCode: orgChild4.orgRoot.orgRootCode + orgChild4.orgChild4Code,
|
||||
};
|
||||
return new HttpSuccess(getOrgChild4);
|
||||
|
|
@ -254,6 +255,7 @@ export class OrgChild4Controller extends Controller {
|
|||
DIVISION_CODE: requestBody.DIVISION_CODE != null ? requestBody.DIVISION_CODE : _null,
|
||||
SECTION_CODE: requestBody.SECTION_CODE != null ? requestBody.SECTION_CODE : _null,
|
||||
JOB_CODE: requestBody.JOB_CODE != null ? requestBody.JOB_CODE : _null,
|
||||
CHILD4_CODE: requestBody.CHILD4_CODE != null ? requestBody.CHILD4_CODE : _null,
|
||||
orgChild4PhoneEx: requestBody.orgChild4PhoneEx,
|
||||
orgChild4PhoneIn: requestBody.orgChild4PhoneIn,
|
||||
orgChild4Fax: requestBody.orgChild4Fax,
|
||||
|
|
|
|||
|
|
@ -83,6 +83,7 @@ export class OrgRootController extends Controller {
|
|||
DIVISION_CODE: orgRoot.DIVISION_CODE,
|
||||
SECTION_CODE: orgRoot.SECTION_CODE,
|
||||
JOB_CODE: orgRoot.JOB_CODE,
|
||||
ROOT_CODE: orgRoot.ROOT_CODE,
|
||||
orgCode: orgRoot.orgRootCode + "00",
|
||||
};
|
||||
return new HttpSuccess(getOrgRoot);
|
||||
|
|
@ -350,6 +351,7 @@ export class OrgRootController extends Controller {
|
|||
DIVISION_CODE: requestBody.DIVISION_CODE != null ? requestBody.DIVISION_CODE : _null,
|
||||
SECTION_CODE: requestBody.SECTION_CODE != null ? requestBody.SECTION_CODE : _null,
|
||||
JOB_CODE: requestBody.JOB_CODE != null ? requestBody.JOB_CODE : _null,
|
||||
ROOT_CODE: requestBody.ROOT_CODE != null ? requestBody.ROOT_CODE : _null,
|
||||
});
|
||||
await this.orgRootRepository.save(orgRoot, { data: request });
|
||||
setLogDataDiff(request, { before, after: orgRoot });
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue