fixing path
This commit is contained in:
parent
400b9c0b28
commit
ba612f1b2b
12 changed files with 325 additions and 723 deletions
|
|
@ -27,28 +27,22 @@ import { EvaluateAchievement } from "../entities/EvaluateAchievement";
|
|||
import { EvaluateCommander } from "../entities/EvaluateCommander";
|
||||
import CallAPI from "../interfaces/call-api";
|
||||
|
||||
@Route("api/v1/report")
|
||||
@Route("api/v1/probation/report")
|
||||
@Tags("Report")
|
||||
@Security("bearerAuth")
|
||||
@Response(
|
||||
HttpStatusCode.INTERNAL_SERVER_ERROR,
|
||||
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง"
|
||||
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง",
|
||||
)
|
||||
@SuccessResponse(HttpStatusCode.OK, "สำเร็จ")
|
||||
export class ReportController extends Controller {
|
||||
private evaluateChairmanRepository =
|
||||
AppDataSource.getRepository(EvaluateChairman);
|
||||
private evaluateResultRepository =
|
||||
AppDataSource.getRepository(EvaluateResult);
|
||||
private evaluateChairmanRepository = AppDataSource.getRepository(EvaluateChairman);
|
||||
private evaluateResultRepository = AppDataSource.getRepository(EvaluateResult);
|
||||
private personalRepository = AppDataSource.getRepository(Personal);
|
||||
private evaluateAssessorRepository =
|
||||
AppDataSource.getRepository(EvaluateAssessor);
|
||||
private assignDirectorRepository =
|
||||
AppDataSource.getRepository(AssignDirector);
|
||||
private evaluateAchievementRepository =
|
||||
AppDataSource.getRepository(EvaluateAchievement);
|
||||
private evaluateCommanderRepository =
|
||||
AppDataSource.getRepository(EvaluateCommander);
|
||||
private evaluateAssessorRepository = AppDataSource.getRepository(EvaluateAssessor);
|
||||
private assignDirectorRepository = AppDataSource.getRepository(AssignDirector);
|
||||
private evaluateAchievementRepository = AppDataSource.getRepository(EvaluateAchievement);
|
||||
private evaluateCommanderRepository = AppDataSource.getRepository(EvaluateCommander);
|
||||
|
||||
/**
|
||||
* API สำหรับออกรายงาน
|
||||
|
|
@ -57,10 +51,7 @@ export class ReportController extends Controller {
|
|||
*
|
||||
*/
|
||||
@Get("")
|
||||
async GetReport(
|
||||
@Query() assign_id: string,
|
||||
@Request() request: RequestWithUser
|
||||
) {
|
||||
async GetReport(@Query() assign_id: string) {
|
||||
const evaluate = await this.evaluateChairmanRepository.findOne({
|
||||
where: { assign_id },
|
||||
});
|
||||
|
|
@ -70,21 +61,14 @@ export class ReportController extends Controller {
|
|||
});
|
||||
|
||||
if (!evaluate || !result) {
|
||||
return new HttpError(
|
||||
HttpStatusCode.NOT_FOUND,
|
||||
"ไม่พบข้อมูลผลการทดลองปฏิบัติราชการ"
|
||||
);
|
||||
return new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผลการทดลองปฏิบัติราชการ");
|
||||
}
|
||||
|
||||
const develop_total_score = await (Number(
|
||||
evaluate.develop_orientation_score
|
||||
) +
|
||||
const develop_total_score = await (Number(evaluate.develop_orientation_score) +
|
||||
Number(evaluate.develop_self_learning_score) +
|
||||
Number(evaluate.develop_training_seminar_score) +
|
||||
Number(evaluate.develop_other_training_score));
|
||||
const develop_total_percent = await (Number(
|
||||
evaluate.develop_orientation_percent
|
||||
) +
|
||||
const develop_total_percent = await (Number(evaluate.develop_orientation_percent) +
|
||||
Number(evaluate.develop_orientation_percent) +
|
||||
Number(evaluate.develop_self_learning_percent) +
|
||||
Number(evaluate.develop_training_seminar_percent));
|
||||
|
|
@ -97,8 +81,7 @@ export class ReportController extends Controller {
|
|||
develop_total_score,
|
||||
develop_orientation_percent: evaluate.develop_orientation_percent,
|
||||
develop_self_learning_percent: evaluate.develop_self_learning_percent,
|
||||
develop_training_seminar_percent:
|
||||
evaluate.develop_training_seminar_percent,
|
||||
develop_training_seminar_percent: evaluate.develop_training_seminar_percent,
|
||||
develop_other_training_percent: evaluate.develop_other_training_percent,
|
||||
develop_total_percent,
|
||||
develop_result: evaluate.develop_result,
|
||||
|
|
@ -127,7 +110,7 @@ export class ReportController extends Controller {
|
|||
*
|
||||
*/
|
||||
@Get("pass")
|
||||
async GetPass(@Request() request: RequestWithUser) {
|
||||
async GetPass() {
|
||||
const lists = await this.personalRepository.find({
|
||||
where: { probation_status: 2 },
|
||||
});
|
||||
|
|
@ -148,7 +131,7 @@ export class ReportController extends Controller {
|
|||
},
|
||||
assign,
|
||||
});
|
||||
})
|
||||
}),
|
||||
);
|
||||
|
||||
return new HttpSuccess(data);
|
||||
|
|
@ -161,7 +144,7 @@ export class ReportController extends Controller {
|
|||
*
|
||||
*/
|
||||
@Get("not-pass")
|
||||
async GetDataNotPass(@Request() request: RequestWithUser) {
|
||||
async GetDataNotPass() {
|
||||
const lists = await this.personalRepository.find({
|
||||
where: { probation_status: 3 },
|
||||
});
|
||||
|
|
@ -182,7 +165,7 @@ export class ReportController extends Controller {
|
|||
},
|
||||
assign,
|
||||
});
|
||||
})
|
||||
}),
|
||||
);
|
||||
|
||||
return new HttpSuccess(data);
|
||||
|
|
@ -195,7 +178,7 @@ export class ReportController extends Controller {
|
|||
*
|
||||
*/
|
||||
@Get("expand")
|
||||
async GetDataExpand(@Request() request: RequestWithUser) {
|
||||
async GetDataExpand() {
|
||||
const lists = await this.personalRepository.find({
|
||||
select: ["personal_id"],
|
||||
where: { probation_status: 7 },
|
||||
|
|
@ -214,7 +197,7 @@ export class ReportController extends Controller {
|
|||
async UpdateStatus(
|
||||
@Query() personal_id: string,
|
||||
@Body() requestBody: { command_no: string },
|
||||
@Request() request: RequestWithUser
|
||||
@Request() request: RequestWithUser,
|
||||
) {
|
||||
const personal = await this.personalRepository.findOne({
|
||||
where: { personal_id },
|
||||
|
|
@ -227,6 +210,8 @@ export class ReportController extends Controller {
|
|||
|
||||
personal.order_number = requestBody.command_no;
|
||||
personal.probation_status = 8;
|
||||
personal.updateFullName = request.user.name;
|
||||
personal.updateUserId = request.user.sub;
|
||||
|
||||
this.personalRepository.save(personal, { data: request });
|
||||
setLogDataDiff(request, { before, after: personal });
|
||||
|
|
@ -263,20 +248,23 @@ export class ReportController extends Controller {
|
|||
async ChangeStatus(
|
||||
@Query() personal_id: string,
|
||||
@Body() reqBody: { status: number },
|
||||
@Request() request: RequestWithUser
|
||||
@Request() request: RequestWithUser,
|
||||
) {
|
||||
const person = await this.personalRepository.findOne({
|
||||
const personal = await this.personalRepository.findOne({
|
||||
where: { personal_id },
|
||||
});
|
||||
const before = person;
|
||||
const before = personal;
|
||||
|
||||
if (!person) {
|
||||
if (!personal) {
|
||||
return new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล");
|
||||
}
|
||||
|
||||
person.probation_status = await reqBody.status;
|
||||
await this.personalRepository.save(person, { data: request });
|
||||
setLogDataDiff(request, { before, after: person });
|
||||
personal.probation_status = await reqBody.status;
|
||||
personal.updateFullName = request.user.name;
|
||||
personal.updateUserId = request.user.sub;
|
||||
|
||||
await this.personalRepository.save(personal, { data: request });
|
||||
setLogDataDiff(request, { before, after: personal });
|
||||
|
||||
return new HttpSuccess();
|
||||
}
|
||||
|
|
@ -288,10 +276,7 @@ export class ReportController extends Controller {
|
|||
*
|
||||
*/
|
||||
@Get("form-record")
|
||||
async GetDataFormRecord(
|
||||
@Query() id: string,
|
||||
@Request() request: RequestWithUser
|
||||
) {
|
||||
async GetDataFormRecord(@Query() id: string) {
|
||||
const evaluate = await this.evaluateAssessorRepository.findOne({
|
||||
where: { id },
|
||||
});
|
||||
|
|
@ -301,15 +286,7 @@ export class ReportController extends Controller {
|
|||
}
|
||||
|
||||
const directorData = await this.assignDirectorRepository.findOne({
|
||||
select: [
|
||||
"personal_id",
|
||||
"fullname",
|
||||
"position",
|
||||
"posType",
|
||||
"posLevel",
|
||||
"role",
|
||||
"dated",
|
||||
],
|
||||
select: ["personal_id", "fullname", "position", "posType", "posLevel", "role", "dated"],
|
||||
where: { personal_id: evaluate.director_id },
|
||||
});
|
||||
|
||||
|
|
@ -356,7 +333,7 @@ export class ReportController extends Controller {
|
|||
evaluate_expect_level,
|
||||
evaluate_output_level,
|
||||
});
|
||||
})
|
||||
}),
|
||||
);
|
||||
|
||||
const evaluateData = await {
|
||||
|
|
@ -579,10 +556,7 @@ export class ReportController extends Controller {
|
|||
*
|
||||
*/
|
||||
@Get("evaluate-commander")
|
||||
async GetDataEvaluateCommander(
|
||||
@Query() id: string,
|
||||
@Request() request: RequestWithUser
|
||||
) {
|
||||
async GetDataEvaluateCommander(@Query() id: string) {
|
||||
const evaluate = await this.evaluateCommanderRepository.findOne({
|
||||
where: { id },
|
||||
});
|
||||
|
|
@ -836,10 +810,7 @@ export class ReportController extends Controller {
|
|||
*
|
||||
*/
|
||||
@Get("evaluate-chairman")
|
||||
async GetDataEvaluateChairman(
|
||||
@Query() id: string,
|
||||
@Request() request: RequestWithUser
|
||||
) {
|
||||
async GetDataEvaluateChairman(@Query() id: string) {
|
||||
const evaluate = await this.evaluateChairmanRepository.findOne({
|
||||
where: { id },
|
||||
});
|
||||
|
|
@ -848,15 +819,11 @@ export class ReportController extends Controller {
|
|||
return new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
|
||||
}
|
||||
|
||||
const develop_total_score = await (Number(
|
||||
evaluate.develop_orientation_score
|
||||
) +
|
||||
const develop_total_score = await (Number(evaluate.develop_orientation_score) +
|
||||
Number(evaluate.develop_self_learning_score) +
|
||||
Number(evaluate.develop_training_seminar_score) +
|
||||
Number(evaluate.develop_other_training_score));
|
||||
const develop_total_percent = await (Number(
|
||||
evaluate.develop_orientation_percent
|
||||
) +
|
||||
const develop_total_percent = await (Number(evaluate.develop_orientation_percent) +
|
||||
Number(evaluate.develop_orientation_percent) +
|
||||
Number(evaluate.develop_self_learning_percent) +
|
||||
Number(evaluate.develop_training_seminar_percent));
|
||||
|
|
@ -1029,8 +996,7 @@ export class ReportController extends Controller {
|
|||
develop_total_score: develop_total_score,
|
||||
develop_orientation_percent: evaluate.develop_orientation_percent,
|
||||
develop_self_learning_percent: evaluate.develop_self_learning_percent,
|
||||
develop_training_seminar_percent:
|
||||
evaluate.develop_training_seminar_percent,
|
||||
develop_training_seminar_percent: evaluate.develop_training_seminar_percent,
|
||||
develop_other_training_percent: evaluate.develop_other_training_percent,
|
||||
develop_total_percent: develop_total_percent,
|
||||
develop_result: evaluate.develop_result,
|
||||
|
|
@ -1070,15 +1036,7 @@ export class ReportController extends Controller {
|
|||
};
|
||||
|
||||
const directorData = await this.assignDirectorRepository.find({
|
||||
select: [
|
||||
"personal_id",
|
||||
"fullname",
|
||||
"position",
|
||||
"posType",
|
||||
"posLevel",
|
||||
"role",
|
||||
"dated",
|
||||
],
|
||||
select: ["personal_id", "fullname", "position", "posType", "posLevel", "role", "dated"],
|
||||
where: { assign_id: assign.id },
|
||||
});
|
||||
|
||||
|
|
@ -1093,18 +1051,16 @@ export class ReportController extends Controller {
|
|||
name: element.fullname,
|
||||
Position: element.position,
|
||||
};
|
||||
})
|
||||
}),
|
||||
);
|
||||
|
||||
const mentorData = await (director.find((x) => x.role == "mentor") ?? null);
|
||||
const mentor = mentorData != null ? mentorData : null;
|
||||
|
||||
const commanderData = await (director.find((x) => x.role == "commander") ??
|
||||
null);
|
||||
const commanderData = await (director.find((x) => x.role == "commander") ?? null);
|
||||
const commander = commanderData != null ? commanderData : null;
|
||||
|
||||
const chairmanData = await (director.find((x) => x.role == "chairman") ??
|
||||
null);
|
||||
const chairmanData = await (director.find((x) => x.role == "chairman") ?? null);
|
||||
const chairman = chairmanData != null ? chairmanData : null;
|
||||
|
||||
return new HttpSuccess({
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue