ปรับ การทดลองปฏิบัติหน้าที่ราชการ
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
parent
ee80702930
commit
fc3f40722e
5 changed files with 624 additions and 434 deletions
|
|
@ -23,7 +23,10 @@ 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")
|
||||
|
|
@ -31,14 +34,17 @@ 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 ข้อมูลตอนกดสร้างแบบรายงานการประเมินฯ
|
||||
|
|
@ -47,9 +53,17 @@ 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"],
|
||||
|
|
@ -64,7 +78,10 @@ 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);
|
||||
|
|
@ -75,7 +92,10 @@ export class EvaluateResultController extends Controller {
|
|||
});
|
||||
|
||||
if (!directorData) {
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน");
|
||||
throw new HttpError(
|
||||
HttpStatusCode.NOT_FOUND,
|
||||
"ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน"
|
||||
);
|
||||
}
|
||||
|
||||
let mentors = [];
|
||||
|
|
@ -89,7 +109,9 @@ export class EvaluateResultController extends Controller {
|
|||
dated: e.dated,
|
||||
name: e.fullname,
|
||||
label:
|
||||
e.fullname + " " + (e.position ? `(${e.position}, ${e.posType}: ${e.posLevel})` : ""),
|
||||
e.fullname +
|
||||
" " +
|
||||
(e.position ? `(${e.position}${e.posLevel})` : ""),
|
||||
position: e.position,
|
||||
posType: e.posType,
|
||||
posLevel: e.posLevel,
|
||||
|
|
@ -97,7 +119,9 @@ 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
|
||||
|
|
@ -109,7 +133,7 @@ export class EvaluateResultController extends Controller {
|
|||
commanderData.fullname +
|
||||
" " +
|
||||
(commanderData.position
|
||||
? `(${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})`
|
||||
? `(${commanderData.position}${commanderData.posLevel})`
|
||||
: ""),
|
||||
position: commanderData.position,
|
||||
posType: commanderData.posType,
|
||||
|
|
@ -117,7 +141,9 @@ 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
|
||||
? {
|
||||
|
|
@ -128,7 +154,7 @@ export class EvaluateResultController extends Controller {
|
|||
chairmanData.fullname +
|
||||
" " +
|
||||
(chairmanData.position
|
||||
? `(${chairmanData.position}, ${chairmanData.posType}: ${chairmanData.posLevel})`
|
||||
? `(${chairmanData.position}${chairmanData.posLevel})`
|
||||
: ""),
|
||||
position: chairmanData.position,
|
||||
posType: chairmanData.posType,
|
||||
|
|
@ -136,7 +162,7 @@ export class EvaluateResultController extends Controller {
|
|||
}
|
||||
: null;
|
||||
|
||||
const resultData = await this.evaluateChairmanRepository.findOne({
|
||||
const resultData = await this.evaluateChairmanRepository.find({
|
||||
select: [
|
||||
"develop_orientation_score",
|
||||
"develop_self_learning_score",
|
||||
|
|
@ -152,18 +178,34 @@ export class EvaluateResultController extends Controller {
|
|||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมินผล");
|
||||
}
|
||||
|
||||
const develop_complete = await (resultData.develop_orientation_score > 0 &&
|
||||
resultData.develop_self_learning_score > 0 &&
|
||||
resultData.develop_training_seminar_score > 0
|
||||
? 1
|
||||
: 2);
|
||||
const result = resultData.map((e) => {
|
||||
const develop_complete =
|
||||
e.develop_orientation_score > 0 &&
|
||||
e.develop_self_learning_score > 0 &&
|
||||
e.develop_training_seminar_score
|
||||
? 1
|
||||
: 2;
|
||||
|
||||
const evaluate_result = await (resultData.evaluate_result == 1 ? 1 : 2);
|
||||
const evaluate_result = e.evaluate_result === 1 ? 1 : 2;
|
||||
|
||||
const result = await {
|
||||
develop_complete: develop_complete,
|
||||
evaluate_result: evaluate_result,
|
||||
};
|
||||
return {
|
||||
develop_complete,
|
||||
evaluate_result,
|
||||
};
|
||||
});
|
||||
|
||||
// const develop_complete = await (resultData.develop_orientation_score > 0 &&
|
||||
// resultData.develop_self_learning_score > 0 &&
|
||||
// resultData.develop_training_seminar_score > 0
|
||||
// ? 1
|
||||
// : 2);
|
||||
|
||||
// const evaluate_result = await (resultData.evaluate_result == 1 ? 1 : 2);
|
||||
|
||||
// const result = await {
|
||||
// develop_complete: develop_complete,
|
||||
// evaluate_result: evaluate_result,
|
||||
// };
|
||||
|
||||
return new HttpSuccess({
|
||||
person: profile,
|
||||
|
|
@ -185,7 +227,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");
|
||||
|
||||
|
|
@ -201,14 +243,26 @@ export class EvaluateResultController extends Controller {
|
|||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
|
||||
}
|
||||
const director_id = director.personal_id;
|
||||
|
||||
const evaluate = await this.evaluateResultRepository.findOne({
|
||||
where: {
|
||||
director_id,
|
||||
assign_id,
|
||||
},
|
||||
});
|
||||
|
||||
let evaluate: any = null;
|
||||
if (evaluate_no) {
|
||||
evaluate = await this.evaluateResultRepository.findOne({
|
||||
where: {
|
||||
director_id,
|
||||
assign_id,
|
||||
no: evaluate_no,
|
||||
},
|
||||
});
|
||||
// if (!evaluate) {
|
||||
// throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบประเมิน");
|
||||
// }
|
||||
} else {
|
||||
evaluate = await this.evaluateResultRepository.findOne({
|
||||
where: {
|
||||
director_id,
|
||||
assign_id,
|
||||
},
|
||||
});
|
||||
}
|
||||
if (!evaluate) {
|
||||
return new HttpSuccess(null);
|
||||
}
|
||||
|
|
@ -243,10 +297,15 @@ 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,
|
||||
};
|
||||
|
||||
|
|
@ -256,7 +315,10 @@ export class EvaluateResultController extends Controller {
|
|||
});
|
||||
|
||||
if (!directorData) {
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน");
|
||||
throw new HttpError(
|
||||
HttpStatusCode.NOT_FOUND,
|
||||
"ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน"
|
||||
);
|
||||
}
|
||||
|
||||
let mentors = [];
|
||||
|
|
@ -270,7 +332,9 @@ export class EvaluateResultController extends Controller {
|
|||
dated: e.dated,
|
||||
name: e.fullname,
|
||||
label:
|
||||
e.fullname + " " + (e.position ? `(${e.position}, ${e.posType}: ${e.posLevel})` : ""),
|
||||
e.fullname +
|
||||
" " +
|
||||
(e.position ? `(${e.position}${e.posLevel})` : ""),
|
||||
position: e.position + e.posLevel,
|
||||
posType: e.posType,
|
||||
posLevel: e.posLevel,
|
||||
|
|
@ -278,7 +342,9 @@ 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
|
||||
|
|
@ -290,7 +356,7 @@ export class EvaluateResultController extends Controller {
|
|||
commanderData.fullname +
|
||||
" " +
|
||||
(commanderData.position
|
||||
? `(${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})`
|
||||
? `(${commanderData.position}${commanderData.posLevel})`
|
||||
: ""),
|
||||
position: commanderData.position + commanderData.posLevel,
|
||||
posType: commanderData.posType,
|
||||
|
|
@ -298,7 +364,9 @@ 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
|
||||
? {
|
||||
|
|
@ -309,7 +377,7 @@ export class EvaluateResultController extends Controller {
|
|||
chairmanData.fullname +
|
||||
" " +
|
||||
(chairmanData.position
|
||||
? `(${chairmanData.position}, ${chairmanData.posType}: ${chairmanData.posLevel})`
|
||||
? `(${chairmanData.position}${chairmanData.posLevel})`
|
||||
: ""),
|
||||
position: chairmanData.position + chairmanData.posLevel,
|
||||
posType: chairmanData.posType,
|
||||
|
|
@ -323,7 +391,7 @@ export class EvaluateResultController extends Controller {
|
|||
mentors,
|
||||
experimentee,
|
||||
assign,
|
||||
evaluate: evaluate,
|
||||
evaluate: evaluate ? evaluate : null,
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -337,7 +405,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");
|
||||
|
||||
|
|
@ -366,10 +434,11 @@ export class EvaluateResultController extends Controller {
|
|||
assign_id,
|
||||
...requestBody,
|
||||
director_id,
|
||||
no: 1,
|
||||
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,
|
||||
|
|
@ -430,7 +499,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");
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue