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

fix

Browse source
This commit is contained in:
AdisakKanthawilang 2024-05-08 14:10:22 +07:00
parent f3c66103a9
commit b63d998442
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/KpiPlanController.ts
View file

@ -342,8 +342,8 @@ export class kpiPlanController extends Controller {
id: kpiPlan.id, id: kpiPlan.id,
// year: kpiPlan.kpiPeriod == null ? null : kpiPlan.kpiPeriod.year, // year: kpiPlan.kpiPeriod == null ? null : kpiPlan.kpiPeriod.year,
// round: kpiPlan.kpiPeriod == null ? null : kpiPlan.kpiPeriod.durationKPI, // round: kpiPlan.kpiPeriod == null ? null : kpiPlan.kpiPeriod.durationKPI,
year: kpiPlan.kpiPeriod == null ? null : kpiPlan.year, year: kpiPlan.year == null ? null : kpiPlan.year,
round: kpiPlan.kpiPeriod == null ? null : kpiPlan.period, round: kpiPlan.period == null ? null : kpiPlan.period,
kpiPeriodId: kpiPlan.kpiPeriodId, kpiPeriodId: kpiPlan.kpiPeriodId,
including: kpiPlan.including, including: kpiPlan.including,
includingName: kpiPlan.includingName, includingName: kpiPlan.includingName,

8
src/controllers/KpiRoleController.ts
View file

@ -296,8 +296,10 @@ export class kpiRoleController extends Controller {
} }
const formattedData = { const formattedData = {
id: kpiRole.id, id: kpiRole.id,
year: kpiRole.kpiPeriod == null ? null : kpiRole.kpiPeriod.year, // year: kpiRole.kpiPeriod == null ? null : kpiRole.kpiPeriod.year,
round: kpiRole.kpiPeriod == null ? null : kpiRole.kpiPeriod.durationKPI, // round: kpiRole.kpiPeriod == null ? null : kpiRole.kpiPeriod.durationKPI,
year: kpiRole.year == null ? null : kpiRole.year,
round: kpiRole.period == null ? null : kpiRole.period,
kpiPeriodId: kpiRole.kpiPeriodId, kpiPeriodId: kpiRole.kpiPeriodId,
including: kpiRole.including, including: kpiRole.including,
includingName: kpiRole.includingName, includingName: kpiRole.includingName,
@ -321,6 +323,8 @@ export class kpiRoleController extends Controller {
nodeName: nodeName, nodeName: nodeName,
orgRevisionId: kpiRole.orgRevisionId, orgRevisionId: kpiRole.orgRevisionId,
position: kpiRole.position, position: kpiRole.position,
documentInfoEvidence: kpiRole.documentInfoEvidence,
}; };
return new HttpSuccess(formattedData); return new HttpSuccess(formattedData);
} }