fix order
This commit is contained in:
parent
7469393551
commit
1837cf09ac
4 changed files with 5 additions and 5 deletions
|
|
@ -1757,7 +1757,7 @@ export class DevelopmentController extends Controller {
|
||||||
})
|
})
|
||||||
.select(["development.id", "development.projectName", "development.year"])
|
.select(["development.id", "development.projectName", "development.year"])
|
||||||
.orderBy("development.year", "DESC")
|
.orderBy("development.year", "DESC")
|
||||||
.orderBy("development.createdAt", "DESC")
|
.addOrderBy("development.createdAt", "DESC")
|
||||||
.getManyAndCount();
|
.getManyAndCount();
|
||||||
|
|
||||||
return new HttpSuccess({ data: development, total });
|
return new HttpSuccess({ data: development, total });
|
||||||
|
|
@ -1944,7 +1944,7 @@ export class DevelopmentController extends Controller {
|
||||||
"development.child4",
|
"development.child4",
|
||||||
])
|
])
|
||||||
.orderBy("development.year", "DESC")
|
.orderBy("development.year", "DESC")
|
||||||
.orderBy("development.createdAt", "DESC")
|
.addOrderBy("development.createdAt", "DESC")
|
||||||
.skip((page - 1) * pageSize)
|
.skip((page - 1) * pageSize)
|
||||||
.take(pageSize)
|
.take(pageSize)
|
||||||
.getManyAndCount();
|
.getManyAndCount();
|
||||||
|
|
|
||||||
|
|
@ -319,7 +319,7 @@ export class DevelopmentEmployeeHistoryController extends Controller {
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
.orderBy("development.year", "DESC")
|
.orderBy("development.year", "DESC")
|
||||||
.orderBy("developmentHistory.createdAt", "DESC")
|
.addOrderBy("developmentHistory.createdAt", "DESC")
|
||||||
.skip((body.page - 1) * body.pageSize)
|
.skip((body.page - 1) * body.pageSize)
|
||||||
.take(body.pageSize)
|
.take(body.pageSize)
|
||||||
.getManyAndCount();
|
.getManyAndCount();
|
||||||
|
|
|
||||||
|
|
@ -314,7 +314,7 @@ export class DevelopmentOfficerHistoryController extends Controller {
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
.orderBy("development.year", "DESC")
|
.orderBy("development.year", "DESC")
|
||||||
.orderBy("developmentHistory.createdAt", "DESC")
|
.addOrderBy("developmentHistory.createdAt", "DESC")
|
||||||
.skip((body.page - 1) * body.pageSize)
|
.skip((body.page - 1) * body.pageSize)
|
||||||
.take(body.pageSize)
|
.take(body.pageSize)
|
||||||
.getManyAndCount();
|
.getManyAndCount();
|
||||||
|
|
|
||||||
|
|
@ -227,7 +227,7 @@ export class DevelopmentScholarshipController extends Controller {
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
.orderBy("developmentScholarship.scholarshipYear", "DESC")
|
.orderBy("developmentScholarship.scholarshipYear", "DESC")
|
||||||
.orderBy("developmentScholarship.createdAt", "DESC")
|
.addOrderBy("developmentScholarship.createdAt", "DESC")
|
||||||
.skip((page - 1) * pageSize)
|
.skip((page - 1) * pageSize)
|
||||||
.take(pageSize)
|
.take(pageSize)
|
||||||
.getManyAndCount();
|
.getManyAndCount();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue