diff --git a/src/controllers/ProfileSalaryTempController.ts b/src/controllers/ProfileSalaryTempController.ts index b972ab1b..e288d320 100644 --- a/src/controllers/ProfileSalaryTempController.ts +++ b/src/controllers/ProfileSalaryTempController.ts @@ -29,7 +29,7 @@ import { ProfileEmployee } from "../entities/ProfileEmployee"; import permission from "../interfaces/permission"; import { OrgRevision } from "../entities/OrgRevision"; import Extension from "../interfaces/extension"; - @Route("api/v1/org/profile/salaryTemp") +@Route("api/v1/org/profile/salaryTemp") @Tags("ProfileSalaryTemp") @Security("bearerAuth") export class ProfileSalaryTempController extends Controller { @@ -87,7 +87,9 @@ export class ProfileSalaryTempController extends Controller { orgRevisionId: findRevision.id, }) .andWhere( - statusCheckEdit != undefined && statusCheckEdit != null && statusCheckEdit.toUpperCase() != "ALL" + statusCheckEdit != undefined && + statusCheckEdit != null && + statusCheckEdit.toUpperCase() != "ALL" ? "profile.statusCheckEdit = :statusCheckEdit" : "1=1", { @@ -273,7 +275,7 @@ export class ProfileSalaryTempController extends Controller { orgRevisionId: root == null ? null : root.orgRevisionId, org: `${_child4}${_child3}${_child2}${_child1}${root?.orgRootName ?? ""}`, statusCheckEdit: _data.statusCheckEdit, - type: "OFFICER" + type: "OFFICER", }; }), ); @@ -540,7 +542,7 @@ export class ProfileSalaryTempController extends Controller { child4ShortName: _data.child4ShortNameTemp ? _data.child4ShortNameTemp : null, org: `${_child4}${_child3}${_child2}${_child1}${root?.orgRootName ?? ""}`, statusCheckEdit: _data.statusCheckEdit, - type: "EMPLOYEE" + type: "EMPLOYEE", }; }), ); @@ -614,18 +616,18 @@ export class ProfileSalaryTempController extends Controller { * @summary API Get ตำแหน่งเงินเดือน * */ - @Get("get/{salaryId}") - public async getSalary(@Path() salaryId: string, @Request() req: RequestWithUser) { - const salary = await this.salaryRepo.findOne({ - where: { id: salaryId }, - relations: ["profileSalary"], - }); - if (!salary) { - throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); - } - return new HttpSuccess({ salaryNew: salary, salaryOld: salary.profileSalary }); + @Get("get/{salaryId}") + public async getSalary(@Path() salaryId: string, @Request() req: RequestWithUser) { + const salary = await this.salaryRepo.findOne({ + where: { id: salaryId }, + relations: ["profileSalary"], + }); + if (!salary) { + throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } - + return new HttpSuccess({ salaryNew: salary, salaryOld: salary.profileSalary }); + } + /** * API List ตำแหน่งเงินเดือน * @@ -639,11 +641,9 @@ export class ProfileSalaryTempController extends Controller { @Request() req: RequestWithUser, ) { if (type.toLocaleUpperCase() == "OFFICER") { - const salary = await this.salaryRepo.find({ - where: { - profileId: profileId, - }, - order: { order: "ASC" } + const salary = await this.salaryRepo.find({ + where: { profileId: profileId }, + order: { order: "ASC" }, }); if (salary.length <= 0) { @@ -674,9 +674,9 @@ export class ProfileSalaryTempController extends Controller { } return new HttpSuccess(salary); } else { - const salary = await this.salaryRepo.find({ + const salary = await this.salaryRepo.find({ where: { profileEmployeeId: profileId }, - order: { order: "ASC" } + order: { order: "ASC" }, }); if (salary.length <= 0) { let salaryOld = await this.salaryOldRepo.find({ @@ -756,8 +756,6 @@ export class ProfileSalaryTempController extends Controller { } } - - /** * API สร้างตำแหน่งเงินเดือน *