diff --git a/src/controllers/EvaluateResultController.ts b/src/controllers/EvaluateResultController.ts index 1e6cb1f..68f7663 100644 --- a/src/controllers/EvaluateResultController.ts +++ b/src/controllers/EvaluateResultController.ts @@ -23,10 +23,7 @@ import { Assign } from "../entities/Assign"; import { Personal } from "../entities/Personal"; import CallAPI from "../interfaces/call-api"; import { EvaluateChairman } from "../entities/EvaluateChairman"; -import { - CreateEvaluateResult, - EvaluateResult, -} from "../entities/EvaluateResult"; +import { CreateEvaluateResult, EvaluateResult } from "../entities/EvaluateResult"; import permission from "../interfaces/permission"; @Route("api/v1/probation/evaluate-result") @@ -34,17 +31,14 @@ import permission from "../interfaces/permission"; @Security("bearerAuth") @Response( HttpStatusCode.INTERNAL_SERVER_ERROR, - "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง" + "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) export class EvaluateResultController extends Controller { - private assignDirectorRepository = - AppDataSource.getRepository(AssignDirector); + private assignDirectorRepository = AppDataSource.getRepository(AssignDirector); private assignRepository = AppDataSource.getRepository(Assign); - private evaluateChairmanRepository = - AppDataSource.getRepository(EvaluateChairman); + private evaluateChairmanRepository = AppDataSource.getRepository(EvaluateChairman); private personalRepository = AppDataSource.getRepository(Personal); - private evaluateResultRepository = - AppDataSource.getRepository(EvaluateResult); + private evaluateResultRepository = AppDataSource.getRepository(EvaluateResult); /** * API ข้อมูลตอนกดสร้างแบบรายงานการประเมินฯ @@ -53,17 +47,9 @@ export class EvaluateResultController extends Controller { * */ @Get("create") - async CreateEvaluate( - @Query() assign_id: string, - @Request() request: RequestWithUser - ) { - let _workflow = await new permission().Workflow( - request, - assign_id, - "SYS_PROBATION" - ); - if (_workflow == false) - await new permission().PermissionGet(request, "SYS_PROBATION"); + async CreateEvaluate(@Query() assign_id: string, @Request() request: RequestWithUser) { + let _workflow = await new permission().Workflow(request, assign_id, "SYS_PROBATION"); + if (_workflow == false) await new permission().PermissionGet(request, "SYS_PROBATION"); const assign = await this.assignRepository.findOne({ relations: ["profile"], @@ -78,10 +64,7 @@ export class EvaluateResultController extends Controller { ...assign.profile, id: assign.profile.personal_id, name: - assign.profile.prefixName + - assign.profile.firstName + - " " + - assign.profile.lastName, + assign.profile.prefixName + assign.profile.firstName + " " + assign.profile.lastName, Oc: assign.profile.organization, } : null); @@ -92,10 +75,7 @@ export class EvaluateResultController extends Controller { }); if (!directorData) { - throw new HttpError( - HttpStatusCode.NOT_FOUND, - "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน" - ); + throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน"); } let mentors = []; @@ -108,10 +88,7 @@ export class EvaluateResultController extends Controller { personal_id: e.personal_id, dated: e.dated, name: e.fullname, - label: - e.fullname + - " " + - (e.position ? `(${e.position}${e.posLevel})` : ""), + label: e.fullname + " " + (e.position ? `(${e.position}${e.posLevel})` : ""), position: e.position, posType: e.posType, posLevel: e.posLevel, @@ -119,9 +96,7 @@ export class EvaluateResultController extends Controller { } } - const commanderData = await (directorData.find( - (x) => x.role == "commander" - ) ?? null); + const commanderData = await (directorData.find((x) => x.role == "commander") ?? null); const commander = commanderData != null @@ -141,9 +116,7 @@ export class EvaluateResultController extends Controller { } : null; - const chairmanData = await (directorData.find( - (x) => x.role == "chairman" - ) ?? null); + const chairmanData = await (directorData.find((x) => x.role == "chairman") ?? null); const chairman = chairmanData != null ? { @@ -153,9 +126,7 @@ export class EvaluateResultController extends Controller { label: chairmanData.fullname + " " + - (chairmanData.position - ? `(${chairmanData.position}${chairmanData.posLevel})` - : ""), + (chairmanData.position ? `(${chairmanData.position}${chairmanData.posLevel})` : ""), position: chairmanData.position, posType: chairmanData.posType, posLevel: chairmanData.posLevel, @@ -227,7 +198,7 @@ export class EvaluateResultController extends Controller { async GetEvaluate( @Request() request: RequestWithUser, @Query() assign_id: string, - @Query() evaluate_no?: string + @Query() evaluate_no?: string, ) { await new permission().PermissionGet(request, "SYS_PROBATION"); @@ -297,15 +268,10 @@ export class EvaluateResultController extends Controller { const experimentee = await { ...experimenteeData, name: - experimenteeData.prefixName + - experimenteeData.firstName + - " " + - experimenteeData.lastName, - PositionLevel: - experimenteeData.positionName + experimenteeData.positionLevelName, + experimenteeData.prefixName + experimenteeData.firstName + " " + experimenteeData.lastName, + PositionLevel: experimenteeData.positionName + experimenteeData.positionLevelName, Department: splitOcAmount > 2 ? splitOc[splitOcAmount - 3] : "-", - OrganizationOrganization: - splitOcAmount > 1 ? splitOc[splitOcAmount - 2] : "-", + OrganizationOrganization: splitOcAmount > 1 ? splitOc[splitOcAmount - 2] : "-", Oc: experimenteeData.orgRootName, }; @@ -315,10 +281,7 @@ export class EvaluateResultController extends Controller { }); if (!directorData) { - throw new HttpError( - HttpStatusCode.NOT_FOUND, - "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน" - ); + throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน"); } let mentors = []; @@ -331,10 +294,7 @@ export class EvaluateResultController extends Controller { personal_id: e.personal_id, dated: e.dated, name: e.fullname, - label: - e.fullname + - " " + - (e.position ? `(${e.position}${e.posLevel})` : ""), + label: e.fullname + " " + (e.position ? `(${e.position}${e.posLevel})` : ""), position: e.position + e.posLevel, posType: e.posType, posLevel: e.posLevel, @@ -342,9 +302,7 @@ export class EvaluateResultController extends Controller { } } - const commanderData = await (directorData.find( - (x) => x.role == "commander" - ) ?? null); + const commanderData = await (directorData.find((x) => x.role == "commander") ?? null); const commander = commanderData != null @@ -364,9 +322,7 @@ export class EvaluateResultController extends Controller { } : null; - const chairmanData = await (directorData.find( - (x) => x.role == "chairman" - ) ?? null); + const chairmanData = await (directorData.find((x) => x.role == "chairman") ?? null); const chairman = chairmanData != null ? { @@ -376,9 +332,7 @@ export class EvaluateResultController extends Controller { label: chairmanData.fullname + " " + - (chairmanData.position - ? `(${chairmanData.position}${chairmanData.posLevel})` - : ""), + (chairmanData.position ? `(${chairmanData.position}${chairmanData.posLevel})` : ""), position: chairmanData.position + chairmanData.posLevel, posType: chairmanData.posType, posLevel: chairmanData.posLevel, @@ -405,7 +359,7 @@ export class EvaluateResultController extends Controller { async PostData( @Query() assign_id: string, @Body() requestBody: CreateEvaluateResult, - @Request() request: RequestWithUser + @Request() request: RequestWithUser, ) { await new permission().PermissionUpdate(request, "SYS_PROBATION"); @@ -437,8 +391,7 @@ export class EvaluateResultController extends Controller { no: requestBody.evaluate_no, personal_id: assign.personal_id, date_start: requestBody.start_date, - expand_month: - requestBody.pass_result == 3 ? Number(requestBody.expand_month) : 0, + expand_month: requestBody.pass_result == 3 ? Number(requestBody.expand_month) : 0, createdUserId: request.user.sub, createdFullName: request.user.name, @@ -460,10 +413,12 @@ export class EvaluateResultController extends Controller { } personal.probation_status = requestBody.pass_result == 1 - ? 2 + ? 2 // ไม่ต่ำกว่ามาตรฐานที่กำหนด เห็นควรให้รับราชการต่อ : requestBody.pass_result == 2 - ? 3 - : personal.probation_status; + ? 3 // ต่ำกว่ามาตรฐานที่กำหนด เห็นควรให้ออกจากราชการ + : requestBody.pass_result == 4 + ? 22 // ไม่ต่ำกว่ามาตรฐานที่กำหนด เห็นควรให้ทดลองปฏิบัติหน้าที่ราชการต่อไป + : personal.probation_status; if (requestBody.pass_result == 3) { personal.probation_status = 7; @@ -499,7 +454,7 @@ export class EvaluateResultController extends Controller { @Query() assign_id: string, @Query() evaluate_id: string, @Body() requestBody: CreateEvaluateResult, - @Request() request: RequestWithUser + @Request() request: RequestWithUser, ) { await new permission().PermissionUpdate(request, "SYS_PROBATION"); @@ -548,10 +503,12 @@ export class EvaluateResultController extends Controller { } personal.probation_status = requestBody.pass_result == 1 - ? 2 + ? 2 // ไม่ต่ำกว่ามาตรฐานที่กำหนด เห็นควรให้รับราชการต่อ : requestBody.pass_result == 2 - ? 3 - : personal.probation_status; + ? 3 // ต่ำกว่ามาตรฐานที่กำหนด เห็นควรให้ออกจากราชการ + : requestBody.pass_result == 4 + ? 22 // ไม่ต่ำกว่ามาตรฐานที่กำหนด เห็นควรให้ทดลองปฏิบัติหน้าที่ราชการต่อไป + : personal.probation_status; if (requestBody.pass_result == 3) { personal.probation_status = 7;