hrms-bangkok/hrms-api-eva
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop'

Browse source
This commit is contained in:
DESKTOP-2S5P7D1\Windows 10 2024-12-24 00:45:37 +07:00
commit 17dee5b79e
4 changed files with 242 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/controllers/EvaluationController.ts
View file

@ -52,6 +52,17 @@ export class EvaluationController {
private directorRepository = AppDataSource.getRepository(Director); private directorRepository = AppDataSource.getRepository(Director);
private meetingRepository = AppDataSource.getRepository(Meeting); private meetingRepository = AppDataSource.getRepository(Meeting);
/**
* API ล้างข้อมูล
*
* @summary ล้างข้อมูล
*
*/
@Get("clear-db")
async ClearDb() {
return new HttpSuccess();
}
/** /**
* ดึงข้อมูลรายการร้องขอการประเมิน * ดึงข้อมูลรายการร้องขอการประเมิน
* *
@ -647,6 +658,44 @@ export class EvaluationController {
return error.status; return error.status;
} }
} }
/**
* API อัพเดทสถานะผลการประเมิน
*
* @summary อัพเดทสถานะผลการประเมิน
*
* @param {string} id id การประเมิน
*/
@Put("updateEvaluationResult/{id}")
async updateEvaluationResult(
@Request() request: RequestWithUser,
@Path() id: string,
@Body() body: { result: string },
) {
try {
const result = body.result.toUpperCase();
if (result !== "PASS" && result !== "NOTPASS" && result !== "PENDING") {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบผลลัพธ์ดังกล่าว");
}
const evaluation = await this.evaluationRepository.findOne({
where: { id },
});
if (!evaluation) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found.");
}
evaluation.evaluationResult = result;
evaluation.lastUpdateUserId = request.user.sub;
evaluation.lastUpdateFullName = request.user.name;
evaluation.lastUpdatedAt = new Date();
await this.evaluationRepository.save(evaluation, { data: request });
return new HttpSuccess();
} catch (error: any) {
return error.status;
}
}
/** /**
* *
* *

327
src/controllers/ReportController.ts
View file

@ -13,6 +13,7 @@ import {
SuccessResponse, SuccessResponse,
Tags, Tags,
Delete, Delete,
Query,
} from "tsoa"; } from "tsoa";
import HttpStatusCode from "../interfaces/http-status"; import HttpStatusCode from "../interfaces/http-status";
import { Evaluation } from "../entities/Evaluation"; import { Evaluation } from "../entities/Evaluation";
@ -30,7 +31,7 @@ import { Brackets } from "typeorm";
import CallAPI from "../interfaces/call-api"; import CallAPI from "../interfaces/call-api";
import { RequestWithUser } from "../middlewares/user"; import { RequestWithUser } from "../middlewares/user";
import Extension from "../interfaces/extension"; import Extension from "../interfaces/extension";
import { Not } from "typeorm" import { Not } from "typeorm";
@Route("api/v1/evaluation/report") @Route("api/v1/evaluation/report")
@Tags("report") @Tags("report")
@Security("bearerAuth") @Security("bearerAuth")
@ -50,6 +51,21 @@ export class ReoportController {
private directorRepository = AppDataSource.getRepository(Director); private directorRepository = AppDataSource.getRepository(Director);
private meetingRepository = AppDataSource.getRepository(Meeting); private meetingRepository = AppDataSource.getRepository(Meeting);
/**
* Report รายงานสรุปจำนวนผลงานการประเมิน
*
* @summary Report รายงานสรุปจำนวนผลงานการประเมิน
*
*/
@Get()
async sumaryEvaluationReport(@Query("year") year?: string, @Query("rootid") rootId?: string) {
return new HttpSuccess({
template: "summary-evaluation",
reportName: "xlsx-report",
data: null,
});
}
/** /**
* Report ระบบประเมินบุคคล * Report ระบบประเมินบุคคล
* *
@ -148,54 +164,53 @@ export class ReoportController {
if (!evaluation) { if (!evaluation) {
return "ไม่พบข้อมูล"; return "ไม่พบข้อมูล";
} }
let root: any let root: any;
let dateStart: any let dateStart: any;
let dateRetireLaw: any let dateRetireLaw: any;
let org: any let org: any;
let commanderFullname: any let commanderFullname: any;
let commanderPosition: any let commanderPosition: any;
let commanderRootName: any let commanderRootName: any;
let commanderOrg: any let commanderOrg: any;
let commanderAboveFullname: any let commanderAboveFullname: any;
let commanderAbovePosition: any let commanderAbovePosition: any;
let commanderAboveRootName: any let commanderAboveRootName: any;
let commanderAboveOrg: any let commanderAboveOrg: any;
if (!evaluation.userId) { if (!evaluation.userId) {
return "ไม่พบข้อมูลผู้ขอประเมิน"; return "ไม่พบข้อมูลผู้ขอประเมิน";
} }
await new CallAPI() await new CallAPI()
.GetData(request, `/org/profile/keycloak/commander/${evaluation.userId}`) .GetData(request, `/org/profile/keycloak/commander/${evaluation.userId}`)
.then(async (x) => { .then(async (x) => {
root = x.root, (root = x.root),
dateStart = x.dateStart, (dateStart = x.dateStart),
dateRetireLaw = x.dateRetireLaw, (dateRetireLaw = x.dateRetireLaw),
org = x.org, (org = x.org),
commanderFullname = x.commanderFullname, (commanderFullname = x.commanderFullname),
commanderPosition = x.commanderPosition, (commanderPosition = x.commanderPosition),
commanderRootName = x.commanderRootName, (commanderRootName = x.commanderRootName),
commanderOrg = x.commanderOrg, (commanderOrg = x.commanderOrg),
commanderAboveFullname = x.commanderAboveFullname, (commanderAboveFullname = x.commanderAboveFullname),
commanderAbovePosition = x.commanderAbovePosition, (commanderAbovePosition = x.commanderAbovePosition),
commanderAboveRootName = x.commanderAboveRootName, (commanderAboveRootName = x.commanderAboveRootName),
commanderAboveOrg = x.commanderAboveOrg (commanderAboveOrg = x.commanderAboveOrg);
}) })
.catch(); .catch();
const evaluationOld = await this.evaluationRepository.find({ const evaluationOld = await this.evaluationRepository.find({
where: { where: {
id: Not(id), id: Not(id),
userId: evaluation.userId, userId: evaluation.userId,
step: "DONE" step: "DONE",
} },
}); });
let subjectOld = evaluationOld.length > 0 let subjectOld =
? evaluationOld.map(x => x.subject).join(", ") evaluationOld.length > 0 ? evaluationOld.map((x) => x.subject).join(", ") : "ไม่มี";
: "ไม่มี" let thaiYear: number = new Date().getFullYear() + 543;
let thaiYear:number = new Date().getFullYear()+543
let years = { let years = {
lastTwoYear: Extension.ToThaiNumber((thaiYear-2).toString()), lastTwoYear: Extension.ToThaiNumber((thaiYear - 2).toString()),
lastOneYear: Extension.ToThaiNumber((thaiYear-1).toString()), lastOneYear: Extension.ToThaiNumber((thaiYear - 1).toString()),
currentYear: Extension.ToThaiNumber(thaiYear.toString()), currentYear: Extension.ToThaiNumber(thaiYear.toString()),
} };
const dataEvaluation = { const dataEvaluation = {
isEducationalQft: evaluation.isEducationalQft, isEducationalQft: evaluation.isEducationalQft,
isGovermantServiceHtr: evaluation.isGovermantServiceHtr, isGovermantServiceHtr: evaluation.isGovermantServiceHtr,
@ -206,7 +221,10 @@ export class ReoportController {
isHaveMinPeriodOrHoldPos: evaluation.isHaveMinPeriodOrHoldPos, isHaveMinPeriodOrHoldPos: evaluation.isHaveMinPeriodOrHoldPos,
type: evaluation.type, type: evaluation.type,
prefix: evaluation.prefix, prefix: evaluation.prefix,
fullName: evaluation.prefix && evaluation.fullName ? `${evaluation.prefix}${evaluation.fullName}` : "-", fullName:
evaluation.prefix && evaluation.fullName
? `${evaluation.prefix}${evaluation.fullName}`
: "-",
position: evaluation.position ? evaluation.position : "-", position: evaluation.position ? evaluation.position : "-",
posNo: evaluation.posNo ? Extension.ToThaiNumber(evaluation.posNo) : "-", posNo: evaluation.posNo ? Extension.ToThaiNumber(evaluation.posNo) : "-",
oc: evaluation.oc ? evaluation.oc : "-", oc: evaluation.oc ? evaluation.oc : "-",
@ -214,12 +232,13 @@ export class ReoportController {
root: root ? root : "-", //หน่วยงาน root: root ? root : "-", //หน่วยงาน
salary: evaluation.salary ? Extension.ToThaiNumber(evaluation.salary) : "-", salary: evaluation.salary ? Extension.ToThaiNumber(evaluation.salary) : "-",
positionLevel: evaluation.positionLevel ? evaluation.positionLevel : "-", positionLevel: evaluation.positionLevel ? evaluation.positionLevel : "-",
birthDate: evaluation.birthDate != null && evaluation.birthDate != "" birthDate:
? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(new Date(evaluation.birthDate))) evaluation.birthDate != null && evaluation.birthDate != ""
: "-", ? Extension.ToThaiNumber(
govAge: evaluation.govAge != null Extension.ToThaiShortDate_noPrefix(new Date(evaluation.birthDate)),
? Extension.ToThaiNumber(evaluation.govAge) )
: "-", : "-",
govAge: evaluation.govAge != null ? Extension.ToThaiNumber(evaluation.govAge) : "-",
experience: evaluation.experience ? evaluation.experience : "-", experience: evaluation.experience ? evaluation.experience : "-",
dateStart: dateStart dateStart: dateStart
? Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date(dateStart))) ? Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date(dateStart)))
@ -229,119 +248,117 @@ export class ReoportController {
: "-", : "-",
subject: evaluation.subject != null ? evaluation.subject : "-", subject: evaluation.subject != null ? evaluation.subject : "-",
subjectOld: subjectOld, subjectOld: subjectOld,
educations: evaluation.education.length > 0 educations:
? evaluation.education.map((education) => ({ evaluation.education.length > 0
educationLevel: education.educationLevel ? evaluation.education.map((education) => ({
? Extension.ToThaiNumber(education.educationLevel) educationLevel: education.educationLevel
: "-", ? Extension.ToThaiNumber(education.educationLevel)
institute: education.institute : "-",
? Extension.ToThaiNumber(education.institute) institute: education.institute ? Extension.ToThaiNumber(education.institute) : "-",
: "-", finishYear: education.finishDate
finishYear: education.finishDate ? Extension.ToThaiNumber(
? Extension.ToThaiNumber((Extension.ToThaiYear(education.finishDate.getFullYear())).toString()) Extension.ToThaiYear(education.finishDate.getFullYear()).toString(),
: "-", )
isDate: education.isDate, : "-",
startDate: education.startDate, isDate: education.isDate,
endDate: education.endDate, startDate: education.startDate,
finishDate: education.finishDate endDate: education.endDate,
? Extension.ToThaiNumber(Extension.ToThaiShortDate(education.finishDate).toString()) finishDate: education.finishDate
: "-", ? Extension.ToThaiNumber(Extension.ToThaiShortDate(education.finishDate).toString())
isEducation: education.isEducation, : "-",
degree: education.degree isEducation: education.isEducation,
? Extension.ToThaiNumber(education.degree) degree: education.degree ? Extension.ToThaiNumber(education.degree) : "-",
: "-", field: education.field ? Extension.ToThaiNumber(education.field) : "-",
field: education.field fundName: education.fundName,
? Extension.ToThaiNumber(education.field) gpa: education.gpa,
: "-", country: education.country,
fundName: education.fundName, other: education.other,
gpa: education.gpa, duration: education.duration,
country: education.country, durationYear: education.durationYear,
other: education.other, }))
duration: education.duration, : [
durationYear: education.durationYear, {
})) educationLevel: "-",
: [{ institute: "-",
educationLevel: "-", finishYear: "-",
institute: "-", finishDate: "-",
finishYear: "-", degree: "-",
finishDate: "-", field: "-",
degree: "-", },
field: "-" ],
}], certificates:
certificates: evaluation.certificate.length > 0 evaluation.certificate.length > 0
? evaluation.certificate.map((certificate) => ({ ? evaluation.certificate.map((certificate) => ({
certificateType: certificate.certificateType certificateType: certificate.certificateType
? Extension.ToThaiNumber(certificate.certificateType) ? Extension.ToThaiNumber(certificate.certificateType)
: "-", : "-",
issuer: certificate.issuer issuer: certificate.issuer ? Extension.ToThaiNumber(certificate.issuer) : "-",
? Extension.ToThaiNumber(certificate.issuer) certificateNo: certificate.certificateNo
: "-", ? Extension.ToThaiNumber(certificate.certificateNo)
certificateNo: certificate.certificateNo : "-",
? Extension.ToThaiNumber(certificate.certificateNo) issueDate: certificate.issueDate,
: "-", expireDate: certificate.expireDate,
issueDate: certificate.issueDate, }))
expireDate: certificate.expireDate, : [
})) {
: [{ certificateType: "-",
certificateType: "-", issuer: "-",
issuer: "-", certificateNo: "-",
certificateNo: "-", issueDate: "-",
issueDate: "-", expireDate: "-",
expireDate: "-", },
}], ],
salaries: evaluation.salaries.length > 0 salaries:
? evaluation.salaries.map((salaries) => ({ evaluation.salaries.length > 0
date: salaries.date ? evaluation.salaries.map((salaries) => ({
? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(salaries.date)) date: salaries.date
: "-", ? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(salaries.date))
amount: salaries.amount : "-",
? Extension.ToThaiNumber(salaries.amount.toLocaleString()) amount: salaries.amount
: "-", ? Extension.ToThaiNumber(salaries.amount.toLocaleString())
position: salaries.position : "-",
? Extension.ToThaiNumber(salaries.position) position: salaries.position ? Extension.ToThaiNumber(salaries.position) : "-",
: "-", positionSalaryAmount: salaries.positionSalaryAmount,
positionSalaryAmount: salaries.positionSalaryAmount, mouthSalaryAmount: salaries.mouthSalaryAmount,
mouthSalaryAmount: salaries.mouthSalaryAmount, posNo: salaries.posNo,
posNo: salaries.posNo, salaryClass: salaries.salaryClass,
salaryClass: salaries.salaryClass, salaryRef: salaries.salaryRef,
salaryRef: salaries.salaryRef, refCommandNo: salaries.refCommandNo,
refCommandNo: salaries.refCommandNo, refCommandDate: salaries.refCommandDate,
refCommandDate: salaries.refCommandDate, salaryStatus: salaries.salaryStatus,
salaryStatus: salaries.salaryStatus, }))
})) : [
: [{ {
date: "-", date: "-",
amount: "-", amount: "-",
position: "-", position: "-",
}], },
trainings: evaluation.training.length > 0 ],
? evaluation.training.map((training) => ({ trainings:
name: training.name evaluation.training.length > 0
? Extension.ToThaiNumber(training.name) ? evaluation.training.map((training) => ({
: "-", name: training.name ? Extension.ToThaiNumber(training.name) : "-",
topic: training.topic topic: training.topic ? Extension.ToThaiNumber(training.topic) : "-",
? Extension.ToThaiNumber(training.topic) startDate: training.startDate
: "-", ? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(training.startDate))
startDate: training.startDate : "-",
? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(training.startDate)) endDate: training.endDate
: "-", ? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(training.endDate))
endDate: training.endDate : "-",
? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(training.endDate)) yearly: training.yearly ? Extension.ToThaiNumber(training.yearly.toString()) : "-",
: "-", place: training.place,
yearly: training.yearly duration: training.duration,
? Extension.ToThaiNumber(training.yearly.toString()) department: training.department,
: "-", numberOrder: training.numberOrder,
place: training.place, dateOrder: training.dateOrder,
duration: training.duration, }))
department: training.department, : [
numberOrder: training.numberOrder, {
dateOrder: training.dateOrder, name: "-",
})) topic: "-",
: [{ yearly: "-",
name: "-", },
topic: "-", ],
yearly: "-",
}],
assessments: evaluation.assessment.map((assessment) => ({ assessments: evaluation.assessment.map((assessment) => ({
date: assessment.date, date: assessment.date,
point1Total: assessment.point1Total, point1Total: assessment.point1Total,
@ -359,7 +376,7 @@ export class ReoportController {
commanderAbovePosition: commanderAbovePosition ? commanderAbovePosition : "-", commanderAbovePosition: commanderAbovePosition ? commanderAbovePosition : "-",
commanderAboveRootName: commanderAboveRootName ? commanderAboveRootName : "-", commanderAboveRootName: commanderAboveRootName ? commanderAboveRootName : "-",
commanderAboveOrg: commanderAboveOrg ? commanderAboveOrg : "-", commanderAboveOrg: commanderAboveOrg ? commanderAboveOrg : "-",
years: years years: years,
}; };
if (!dataEvaluation) { if (!dataEvaluation) {

3
src/entities/Evaluation.ts
View file

@ -186,6 +186,9 @@ export class Evaluation extends EntityBase {
@Column({ nullable: true, comment: "ตำแหน่งที่ได้รับมอบหมาย" }) @Column({ nullable: true, comment: "ตำแหน่งที่ได้รับมอบหมาย" })
assignedPosition: string; assignedPosition: string;
@Column({ nullable: true, comment: "ผลการประเมิน", default: "PENDING" })//PENDING,PASS,NOTPASS
evaluationResult: string;
@OneToMany(() => EvaluationLogs, (evaluationLogs) => evaluationLogs.evaluation) @OneToMany(() => EvaluationLogs, (evaluationLogs) => evaluationLogs.evaluation)
evaluationLogs: EvaluationLogs[]; evaluationLogs: EvaluationLogs[];

14
src/migration/1734665465868-update_12202024me.ts Normal file
View file

@ -0,0 +1,14 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class Update12202024me1734665465868 implements MigrationInterface {
name = 'Update12202024me1734665465868'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`evaluation\` ADD \`evaluationResult\` varchar(255) NULL COMMENT 'ผลการประเมิน' DEFAULT 'PENDING'`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`evaluation\` DROP COLUMN \`evaluationResult\``);
}
}