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

fixing field

Browse source
This commit is contained in:
Warunee Tamkoo 2025-01-11 13:29:21 +07:00
parent 27e54e914a
commit 97825247d7
3 changed files with 448 additions and 360 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/controllers/ReportController.ts
View file

@ -564,6 +564,7 @@ export class ReportController extends Controller {
Department: splitOcAmount > 2 ? splitOc[splitOcAmount - 3] : "-",
OrganizationOrganization: splitOcAmount > 1 ? splitOc[splitOcAmount - 2] : "-",
Oc: experimenteeData.orgRootName,
PositionLevel: experimenteeData.positionName + experimenteeData.positionLevelName,
};
const data = await {
@ -800,6 +801,7 @@ export class ReportController extends Controller {
Department: splitOcAmount > 2 ? splitOc[splitOcAmount - 3] : "-",
OrganizationOrganization: splitOcAmount > 1 ? splitOc[splitOcAmount - 2] : "-",
Oc: experimenteeData.orgRootName,
PositionLevel: experimenteeData.positionName + experimenteeData.positionLevelName,
};
const commanderData = await this.assignDirectorRepository.findOne({
@ -823,7 +825,7 @@ export class ReportController extends Controller {
const commander = await {
...commanderData,
name: commanderData.fullname,
Position: commanderData.position,
Position: commanderData.position + commanderData.posLevel,
};
return new HttpSuccess({
@ -1069,6 +1071,7 @@ export class ReportController extends Controller {
Department: splitOcAmount > 2 ? splitOc[splitOcAmount - 3] : "-",
OrganizationOrganization: splitOcAmount > 1 ? splitOc[splitOcAmount - 2] : "-",
Oc: experimenteeData.orgRootName,
PositionLevel: experimenteeData.positionName + experimenteeData.positionLevelName,
};
const directorData = await this.assignDirectorRepository.find({
@ -1085,7 +1088,7 @@ export class ReportController extends Controller {
return {
...element,
name: element.fullname,
Position: element.position,
Position: element.position + element.posLevel,
};
}),
);