From eeede05a30f44096b838c1fd3b81d4756ab2c984 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Fri, 15 Mar 2024 10:15:10 +0700 Subject: [PATCH] no message --- src/controllers/SalaryPeriodController.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts index 44865ef..c9b4638 100644 --- a/src/controllers/SalaryPeriodController.ts +++ b/src/controllers/SalaryPeriodController.ts @@ -1348,8 +1348,12 @@ export class SalaryPeriodController extends Controller { * */ @Get("active") - async GetListsSalaryPeriodActive() { - const salaryPeriod = await AppDataSource.getRepository(SalaryPeriod) + async GetListsSalaryPeriodActive( + @Query("page") page: number = 1, + @Query("pageSize") pageSize: number = 10, + @Query("keyword") keyword?: string, + ) { + const [salaryPeriod, total] = await AppDataSource.getRepository(SalaryPeriod) .createQueryBuilder("salaryPeriod") .where({ isActive: true }) .select([ @@ -1363,9 +1367,11 @@ export class SalaryPeriodController extends Controller { "salaryPeriod.revisionId", ]) .orderBy("salaryPeriod.effectiveDate", "DESC") - .getMany(); + .skip((page - 1) * pageSize) + .take(pageSize) + .getManyAndCount(); - return new HttpSuccess(salaryPeriod); + return new HttpSuccess({ data: salaryPeriod, total }); } /**