From 3def195a55ae4d21f324c332b2b33b1f7786008c Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Mon, 19 May 2025 11:39:09 +0700 Subject: [PATCH] report order by org (emp) --- src/controllers/ReportController.ts | 168 +++++++++++++++++++++++++++- 1 file changed, 166 insertions(+), 2 deletions(-) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index f04b60e..c754136 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -39,7 +39,7 @@ import { isNotEmittedStatement } from "typescript"; import { SalaryFormulaEmployee } from "../entities/SalaryFormulaEmployee"; @Route("api/v1/salary/report") @Tags("Report") -// @Security("bearerAuth") +@Security("bearerAuth") @Response( HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", @@ -2778,9 +2778,14 @@ export class ReportController extends Controller { }, order: { amount: "ASC", + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", + posMasterNo: "ASC", }, }); - if (!_salaryPeriod) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล"); } @@ -2856,6 +2861,12 @@ export class ReportController extends Controller { }, order: { result: "DESC", + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", + posMasterNo: "ASC", }, }); @@ -2964,6 +2975,12 @@ export class ReportController extends Controller { }, order: { amount: "ASC", + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", + posMasterNo: "ASC", }, }); @@ -3050,6 +3067,12 @@ export class ReportController extends Controller { }, order: { amount: "ASC", + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", + posMasterNo: "ASC", }, }); @@ -3142,6 +3165,12 @@ export class ReportController extends Controller { }, order: { amount: "ASC", + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", + posMasterNo: "ASC", }, }); @@ -3227,6 +3256,12 @@ export class ReportController extends Controller { }, order: { amount: "ASC", + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", + posMasterNo: "ASC", }, }); @@ -3379,6 +3414,11 @@ export class ReportController extends Controller { type: "NONE", }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", orgShortName: "ASC", posMasterNo: "ASC", }, @@ -3544,6 +3584,11 @@ export class ReportController extends Controller { type: Not("NONE"), }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", orgShortName: "ASC", posMasterNo: "ASC", }, @@ -3695,6 +3740,12 @@ export class ReportController extends Controller { }, }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", + posMasterNo: "ASC", positionSalaryAmount: "ASC", }, }); @@ -3783,6 +3834,12 @@ export class ReportController extends Controller { }, }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", + posMasterNo: "ASC", positionSalaryAmount: "ASC", }, }); @@ -3865,6 +3922,12 @@ export class ReportController extends Controller { }, }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", + posMasterNo: "ASC", positionSalaryAmount: "ASC", }, }); @@ -3946,6 +4009,12 @@ export class ReportController extends Controller { }, }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", + posMasterNo: "ASC", positionSalaryAmount: "ASC", }, }); @@ -4431,6 +4500,11 @@ export class ReportController extends Controller { }, }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", orgShortName: "ASC", posMasterNo: "ASC", }, @@ -4609,6 +4683,11 @@ export class ReportController extends Controller { }, }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", orgShortName: "ASC", posMasterNo: "ASC", result: "DESC", @@ -4852,6 +4931,11 @@ export class ReportController extends Controller { type: Not("NONE"), }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", orgShortName: "ASC", posMasterNo: "ASC", }, @@ -4957,6 +5041,11 @@ export class ReportController extends Controller { }, }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", orgShortName: "ASC", posMasterNo: "ASC", }, @@ -5049,6 +5138,11 @@ export class ReportController extends Controller { type: "NONE", }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", orgShortName: "ASC", posMasterNo: "ASC", }, @@ -5143,6 +5237,11 @@ export class ReportController extends Controller { }, }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", orgShortName: "ASC", posMasterNo: "ASC", }, @@ -5255,6 +5354,11 @@ export class ReportController extends Controller { }, }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", orgShortName: "ASC", posMasterNo: "ASC", }, @@ -5337,6 +5441,11 @@ export class ReportController extends Controller { }, }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", orgShortName: "ASC", posMasterNo: "ASC", }, @@ -5536,6 +5645,11 @@ export class ReportController extends Controller { type: "NONE", }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", orgShortName: "ASC", posMasterNo: "ASC", }, @@ -5640,6 +5754,11 @@ export class ReportController extends Controller { }, }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", orgShortName: "ASC", posMasterNo: "ASC", }, @@ -5751,6 +5870,11 @@ export class ReportController extends Controller { }, }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", orgShortName: "ASC", posMasterNo: "ASC", }, @@ -5835,6 +5959,11 @@ export class ReportController extends Controller { isRetired: true, }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", orgShortName: "ASC", posMasterNo: "ASC", }, @@ -5926,6 +6055,11 @@ export class ReportController extends Controller { }, }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", orgShortName: "ASC", posMasterNo: "ASC", }, @@ -6066,6 +6200,11 @@ export class ReportController extends Controller { }, }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", orgShortName: "ASC", posMasterNo: "ASC", type: "DESC", @@ -6162,6 +6301,11 @@ export class ReportController extends Controller { isRetired: false, }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", type: "DESC", orgShortName: "ASC", posMasterNo: "ASC", @@ -6250,6 +6394,11 @@ export class ReportController extends Controller { }, }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", type: "DESC", orgShortName: "ASC", posMasterNo: "ASC", @@ -6361,6 +6510,11 @@ export class ReportController extends Controller { }, }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", orgShortName: "ASC", posMasterNo: "ASC", }, @@ -6500,6 +6654,11 @@ export class ReportController extends Controller { }, }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", orgShortName: "ASC", posMasterNo: "ASC", }, @@ -6693,6 +6852,11 @@ export class ReportController extends Controller { }, }, order: { + rootOrder: "ASC", + child1Order: "ASC", + child2Order: "ASC", + child3Order: "ASC", + child4Order: "ASC", orgShortName: "ASC", posMasterNo: "ASC", },