เช็ค ระบบพัฒนา #811

This commit is contained in:
Bright 2024-11-28 17:22:28 +07:00
parent 531ebab3be
commit 7469393551
3 changed files with 4 additions and 1 deletions

View file

@ -318,6 +318,7 @@ export class DevelopmentEmployeeHistoryController extends Controller {
);
}),
)
.orderBy("development.year", "DESC")
.orderBy("developmentHistory.createdAt", "DESC")
.skip((body.page - 1) * body.pageSize)
.take(body.pageSize)
@ -333,7 +334,7 @@ export class DevelopmentEmployeeHistoryController extends Controller {
year: item.development.year,
posType: item.employeePosType ? item.employeePosType.posTypeName : null,
posLevel: item.employeePosType && item.employeePosLevel
? `${item.employeePosType.posTypeShortName}${item.employeePosLevel.posLevelName}`
? `${item.employeePosType.posTypeShortName} ${item.employeePosLevel.posLevelName}`
: null,
projectName: item.development.projectName,
}));