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

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 49s
Details

Browse source
This commit is contained in:
harid 2025-10-28 10:37:01 +07:00
commit eb9f99399c
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/controllers/KpiCapacityController.ts
View file

@ -438,11 +438,11 @@ export class kpiCapacityController extends Controller {
async listKpiCapacity(
@Request() request: RequestWithUser,
@Query("page") page: number = 1,
@Query("pageSize") pageSize: number = 10,
@Query("pageSize") pageSize?: number,
@Query("type") type?: string,
@Query("keyword") keyword?: string,
) {
const [kpiCapacity, total] = await AppDataSource.getRepository(KpiCapacity)
let query = await AppDataSource.getRepository(KpiCapacity)
.createQueryBuilder("kpiCapacity")
.leftJoinAndSelect("kpiCapacity.kpiCapacityDetails", "kpiCapacityDetail")
.andWhere(
@ -452,8 +452,13 @@ export class kpiCapacityController extends Controller {
)
.andWhere(type == undefined ? "1=1" : { type: type })
.orderBy("kpiCapacity.createdAt", "ASC")
.skip((page - 1) * pageSize)
.take(pageSize)
if (pageSize) {
query = query.skip((page - 1) * pageSize)
.take(pageSize)
}
const [kpiCapacity, total] = await query
.getManyAndCount();
const mapFormula = kpiCapacity.map((item) => ({