updated organization & report

This commit is contained in:
Warunee Tamkoo 2025-01-10 15:37:59 +07:00
parent d490a7cea1
commit a3f04ae04a
2 changed files with 2194 additions and 2057 deletions

View file

@ -1,40 +1,59 @@
import { Controller, Post, Put, Route, Security, Tags, Body, Request, SuccessResponse, Response, Get, Query } from "tsoa" import {
import { AppDataSource } from "../database/data-source" Controller,
import HttpSuccess from "../interfaces/http-success" Post,
import HttpStatusCode from "../interfaces/http-status" Put,
import HttpError from "../interfaces/http-error" Route,
import { RequestWithUser } from "../middlewares/user" Security,
import { findEndDate, setLogDataDiff } from "../interfaces/utils" Tags,
import { Personal } from "../entities/Personal" Body,
import permission from "../interfaces/permission" Request,
import { Assign, CreateAssign } from "../entities/Assign" SuccessResponse,
import { AssignDirector, CreateAssignDirector } from "../entities/AssignDirector" Response,
import { AssignJob, CreateAssignJob } from "../entities/AssignJob" Get,
import { AssignKnowledge, CreateAssignKnowledge } from "../entities/AssignKnowledge" Query,
import { AssignLaw, CreateAssignLaw } from "../entities/AssignLaw" } from "tsoa";
import { AssignSkill, CreateAssignSkill } from "../entities/AssignSkill" import { AppDataSource } from "../database/data-source";
import { AssignCompetency, CreateAssignCompetency } from "../entities/AssignCompetency" import HttpSuccess from "../interfaces/http-success";
import { AssignCompetencyGroup, CreateAssignCompetencyGroup } from "../entities/AssignCompetencyGroup" import HttpStatusCode from "../interfaces/http-status";
import { AssignOutput, CreateAssignOutput } from "../entities/AssignOutput" import HttpError from "../interfaces/http-error";
import { Law } from "../entities/Law" import { RequestWithUser } from "../middlewares/user";
import CallAPI from "../interfaces/call-api" import { findEndDate, setLogDataDiff } from "../interfaces/utils";
import { Personal } from "../entities/Personal";
import permission from "../interfaces/permission";
import { Assign, CreateAssign } from "../entities/Assign";
import { AssignDirector, CreateAssignDirector } from "../entities/AssignDirector";
import { AssignJob, CreateAssignJob } from "../entities/AssignJob";
import { AssignKnowledge, CreateAssignKnowledge } from "../entities/AssignKnowledge";
import { AssignLaw, CreateAssignLaw } from "../entities/AssignLaw";
import { AssignSkill, CreateAssignSkill } from "../entities/AssignSkill";
import { AssignCompetency, CreateAssignCompetency } from "../entities/AssignCompetency";
import {
AssignCompetencyGroup,
CreateAssignCompetencyGroup,
} from "../entities/AssignCompetencyGroup";
import { AssignOutput, CreateAssignOutput } from "../entities/AssignOutput";
import { Law } from "../entities/Law";
import CallAPI from "../interfaces/call-api";
@Route("api/v1/probation/assign") @Route("api/v1/probation/assign")
@Tags("ฟอร์มมอบหมายงาน") @Tags("ฟอร์มมอบหมายงาน")
@Security("bearerAuth") @Security("bearerAuth")
@Response(HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง") @Response(
HttpStatusCode.INTERNAL_SERVER_ERROR,
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง",
)
export class AssignController extends Controller { export class AssignController extends Controller {
private assignRepository = AppDataSource.getRepository(Assign) private assignRepository = AppDataSource.getRepository(Assign);
private personalRepository = AppDataSource.getRepository(Personal) private personalRepository = AppDataSource.getRepository(Personal);
private assignDirectorRepository = AppDataSource.getRepository(AssignDirector) private assignDirectorRepository = AppDataSource.getRepository(AssignDirector);
private assignJobRepository = AppDataSource.getRepository(AssignJob) private assignJobRepository = AppDataSource.getRepository(AssignJob);
private assignKnowledgeRepository = AppDataSource.getRepository(AssignKnowledge) private assignKnowledgeRepository = AppDataSource.getRepository(AssignKnowledge);
private assignLawRepository = AppDataSource.getRepository(AssignLaw) private assignLawRepository = AppDataSource.getRepository(AssignLaw);
private assignSkillRepository = AppDataSource.getRepository(AssignSkill) private assignSkillRepository = AppDataSource.getRepository(AssignSkill);
private assignCompetencyRepository = AppDataSource.getRepository(AssignCompetency) private assignCompetencyRepository = AppDataSource.getRepository(AssignCompetency);
private assignCompetencyGroupRepository = AppDataSource.getRepository(AssignCompetencyGroup) private assignCompetencyGroupRepository = AppDataSource.getRepository(AssignCompetencyGroup);
private assignOutputRepository = AppDataSource.getRepository(AssignOutput) private assignOutputRepository = AppDataSource.getRepository(AssignOutput);
private lawsRepository = AppDataSource.getRepository(Law) private lawsRepository = AppDataSource.getRepository(Law);
/** /**
* API * API
@ -44,7 +63,7 @@ export class AssignController extends Controller {
*/ */
@Get("clear-db") @Get("clear-db")
async ClearDb() { async ClearDb() {
return new HttpSuccess() return new HttpSuccess();
} }
/** /**
@ -55,15 +74,15 @@ export class AssignController extends Controller {
*/ */
@Post("") @Post("")
async AddAssign(@Request() request: RequestWithUser, @Body() requestBody: CreateAssign) { async AddAssign(@Request() request: RequestWithUser, @Body() requestBody: CreateAssign) {
await new permission().PermissionUpdate(request, "SYS_PROBATION") await new permission().PermissionUpdate(request, "SYS_PROBATION");
const person = await this.personalRepository.findOne({ const person = await this.personalRepository.findOne({
where: { where: {
personal_id: requestBody.personalId, personal_id: requestBody.personalId,
}, },
}) });
if (!person) { if (!person) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล") throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล");
} }
const roundNo = await this.assignRepository.count({ const roundNo = await this.assignRepository.count({
@ -71,7 +90,7 @@ export class AssignController extends Controller {
active: 1, active: 1,
personal_id: requestBody.personalId, personal_id: requestBody.personalId,
}, },
}) });
const data: any = { const data: any = {
...requestBody, ...requestBody,
@ -81,10 +100,10 @@ export class AssignController extends Controller {
createdFullName: request.user.name, createdFullName: request.user.name,
updateUserId: request.user.sub, updateUserId: request.user.sub,
updateFullName: request.user.name, updateFullName: request.user.name,
} };
const before = null const before = null;
const assign = await this.assignRepository.save(data, { data: request }) const assign = await this.assignRepository.save(data, { data: request });
setLogDataDiff(request, { before, after: data }) setLogDataDiff(request, { before, after: data });
const jobs = await requestBody.assign_jobs.map((x: CreateAssignJob, index: number) => ({ const jobs = await requestBody.assign_jobs.map((x: CreateAssignJob, index: number) => ({
...x, ...x,
@ -94,11 +113,12 @@ export class AssignController extends Controller {
createdFullName: request.user.name, createdFullName: request.user.name,
updateUserId: request.user.sub, updateUserId: request.user.sub,
updateFullName: request.user.name, updateFullName: request.user.name,
})) }));
await this.assignJobRepository.save(jobs, { data: request }) await this.assignJobRepository.save(jobs, { data: request });
setLogDataDiff(request, { before, after: jobs }) setLogDataDiff(request, { before, after: jobs });
const knowledges = await requestBody.assign_knowledges.map((x: CreateAssignKnowledge, index: number) => ({ const knowledges = await requestBody.assign_knowledges.map(
(x: CreateAssignKnowledge, index: number) => ({
knowledge_level: x.level, knowledge_level: x.level,
knowledge_id: x.id, knowledge_id: x.id,
assign_id: assign.id, assign_id: assign.id,
@ -106,9 +126,10 @@ export class AssignController extends Controller {
createdFullName: request.user.name, createdFullName: request.user.name,
updateUserId: request.user.sub, updateUserId: request.user.sub,
updateFullName: request.user.name, updateFullName: request.user.name,
})) }),
await this.assignKnowledgeRepository.save(knowledges, { data: request }) );
setLogDataDiff(request, { before, after: knowledges }) await this.assignKnowledgeRepository.save(knowledges, { data: request });
setLogDataDiff(request, { before, after: knowledges });
const laws = await requestBody.assign_law.map((x: CreateAssignLaw, index: number) => ({ const laws = await requestBody.assign_law.map((x: CreateAssignLaw, index: number) => ({
ordering: index + 1, ordering: index + 1,
@ -118,9 +139,9 @@ export class AssignController extends Controller {
createdFullName: request.user.name, createdFullName: request.user.name,
updateUserId: request.user.sub, updateUserId: request.user.sub,
updateFullName: request.user.name, updateFullName: request.user.name,
})) }));
await this.assignLawRepository.save(laws, { data: request }) await this.assignLawRepository.save(laws, { data: request });
setLogDataDiff(request, { before, after: laws }) setLogDataDiff(request, { before, after: laws });
const skills = await requestBody.assign_skill.map((x: CreateAssignSkill, index: number) => ({ const skills = await requestBody.assign_skill.map((x: CreateAssignSkill, index: number) => ({
skill_id: index + 1, skill_id: index + 1,
@ -130,11 +151,12 @@ export class AssignController extends Controller {
createdFullName: request.user.name, createdFullName: request.user.name,
updateUserId: request.user.sub, updateUserId: request.user.sub,
updateFullName: request.user.name, updateFullName: request.user.name,
})) }));
await this.assignSkillRepository.save(skills, { data: request }) await this.assignSkillRepository.save(skills, { data: request });
setLogDataDiff(request, { before, after: skills }) setLogDataDiff(request, { before, after: skills });
const competencise = await requestBody.assign_competency.map((x: CreateAssignCompetency, index: number) => ({ const competencise = await requestBody.assign_competency.map(
(x: CreateAssignCompetency, index: number) => ({
competency_id: x.id, competency_id: x.id,
competency_level: x.level, competency_level: x.level,
competency_name: x.name, competency_name: x.name,
@ -144,11 +166,13 @@ export class AssignController extends Controller {
createdFullName: request.user.name, createdFullName: request.user.name,
updateUserId: request.user.sub, updateUserId: request.user.sub,
updateFullName: request.user.name, updateFullName: request.user.name,
})) }),
await this.assignCompetencyRepository.save(competencise, { data: request }) );
setLogDataDiff(request, { before, after: competencise }) await this.assignCompetencyRepository.save(competencise, { data: request });
setLogDataDiff(request, { before, after: competencise });
const competencyGroups = await requestBody.assign_competency_group.map((x: CreateAssignCompetencyGroup, index: number) => ({ const competencyGroups = await requestBody.assign_competency_group.map(
(x: CreateAssignCompetencyGroup, index: number) => ({
competency_group_id: x.id, competency_group_id: x.id,
competency_group_level: x.level, competency_group_level: x.level,
competency_group_name: x.name, competency_group_name: x.name,
@ -158,13 +182,15 @@ export class AssignController extends Controller {
createdFullName: request.user.name, createdFullName: request.user.name,
updateUserId: request.user.sub, updateUserId: request.user.sub,
updateFullName: request.user.name, updateFullName: request.user.name,
})) }),
);
await this.assignCompetencyGroupRepository.save(competencyGroups, { await this.assignCompetencyGroupRepository.save(competencyGroups, {
data: request, data: request,
}) });
setLogDataDiff(request, { before, after: competencyGroups }) setLogDataDiff(request, { before, after: competencyGroups });
const outputs = await requestBody.assign_outputs.map((x: CreateAssignOutput, index: number) => ({ const outputs = await requestBody.assign_outputs.map(
(x: CreateAssignOutput, index: number) => ({
...x, ...x,
id: index + 1, id: index + 1,
assign_id: assign.id, assign_id: assign.id,
@ -172,11 +198,13 @@ export class AssignController extends Controller {
createdFullName: request.user.name, createdFullName: request.user.name,
updateUserId: request.user.sub, updateUserId: request.user.sub,
updateFullName: request.user.name, updateFullName: request.user.name,
})) }),
await this.assignOutputRepository.save(outputs, { data: request }) );
setLogDataDiff(request, { before, after: outputs }) await this.assignOutputRepository.save(outputs, { data: request });
setLogDataDiff(request, { before, after: outputs });
const directors = await requestBody.assign_director.map((x: CreateAssignDirector, index: number) => ({ const directors = await requestBody.assign_director.map(
(x: CreateAssignDirector, index: number) => ({
...x, ...x,
assign_id: assign.id, assign_id: assign.id,
fullname: x.name, fullname: x.name,
@ -185,11 +213,12 @@ export class AssignController extends Controller {
createdFullName: request.user.name, createdFullName: request.user.name,
updateUserId: request.user.sub, updateUserId: request.user.sub,
updateFullName: request.user.name, updateFullName: request.user.name,
})) }),
await this.assignDirectorRepository.save(directors, { data: request }) );
setLogDataDiff(request, { before, after: directors }) await this.assignDirectorRepository.save(directors, { data: request });
setLogDataDiff(request, { before, after: directors });
return new HttpSuccess() return new HttpSuccess();
} }
/** /**
@ -199,26 +228,30 @@ export class AssignController extends Controller {
* *
*/ */
@Put("") @Put("")
async EditAssign(@Query() assign_id: string, @Request() request: RequestWithUser, @Body() requestBody: CreateAssign) { async EditAssign(
await new permission().PermissionUpdate(request, "SYS_PROBATION") @Query() assign_id: string,
@Request() request: RequestWithUser,
@Body() requestBody: CreateAssign,
) {
await new permission().PermissionUpdate(request, "SYS_PROBATION");
const assign = await this.assignRepository.findOne({ const assign = await this.assignRepository.findOne({
where: { id: assign_id }, where: { id: assign_id },
}) });
let before = assign let before = assign;
if (!assign) { if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน") throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
} }
const person = await this.personalRepository.findOne({ const person = await this.personalRepository.findOne({
where: { where: {
personal_id: requestBody.personalId, personal_id: requestBody.personalId,
}, },
}) });
if (!person) { if (!person) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล") throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล");
} }
const data: any = { const data: any = {
@ -226,9 +259,9 @@ export class AssignController extends Controller {
id: assign_id, id: assign_id,
updateUserId: request.user.sub, updateUserId: request.user.sub,
updateFullName: request.user.name, updateFullName: request.user.name,
} };
await this.assignJobRepository.delete({ assign_id }) await this.assignJobRepository.delete({ assign_id });
const jobs = await requestBody.assign_jobs.map((x: CreateAssignJob, index: number) => ({ const jobs = await requestBody.assign_jobs.map((x: CreateAssignJob, index: number) => ({
...x, ...x,
id: index + 1, id: index + 1,
@ -237,11 +270,12 @@ export class AssignController extends Controller {
createdFullName: request.user.name, createdFullName: request.user.name,
updateUserId: request.user.sub, updateUserId: request.user.sub,
updateFullName: request.user.name, updateFullName: request.user.name,
})) }));
await this.assignJobRepository.save(jobs) await this.assignJobRepository.save(jobs);
await this.assignKnowledgeRepository.delete({ assign_id }) await this.assignKnowledgeRepository.delete({ assign_id });
const knowledges = await requestBody.assign_knowledges.map((x: CreateAssignKnowledge, index: number) => ({ const knowledges = await requestBody.assign_knowledges.map(
(x: CreateAssignKnowledge, index: number) => ({
knowledge_level: x.level, knowledge_level: x.level,
knowledge_id: x.id, knowledge_id: x.id,
assign_id: assign.id, assign_id: assign.id,
@ -249,10 +283,11 @@ export class AssignController extends Controller {
createdFullName: request.user.name, createdFullName: request.user.name,
updateUserId: request.user.sub, updateUserId: request.user.sub,
updateFullName: request.user.name, updateFullName: request.user.name,
})) }),
await this.assignKnowledgeRepository.save(knowledges) );
await this.assignKnowledgeRepository.save(knowledges);
await this.assignLawRepository.delete({ assign_id }) await this.assignLawRepository.delete({ assign_id });
const laws = await requestBody.assign_law.map((x: CreateAssignLaw, index: number) => ({ const laws = await requestBody.assign_law.map((x: CreateAssignLaw, index: number) => ({
ordering: index + 1, ordering: index + 1,
law_id: x.id, law_id: x.id,
@ -261,10 +296,10 @@ export class AssignController extends Controller {
createdFullName: request.user.name, createdFullName: request.user.name,
updateUserId: request.user.sub, updateUserId: request.user.sub,
updateFullName: request.user.name, updateFullName: request.user.name,
})) }));
await this.assignLawRepository.save(laws) await this.assignLawRepository.save(laws);
await this.assignSkillRepository.delete({ assign_id }) await this.assignSkillRepository.delete({ assign_id });
const skills = await requestBody.assign_skill.map((x: CreateAssignSkill, index: number) => ({ const skills = await requestBody.assign_skill.map((x: CreateAssignSkill, index: number) => ({
skill_id: index + 1, skill_id: index + 1,
skill_level: x.level, skill_level: x.level,
@ -273,11 +308,12 @@ export class AssignController extends Controller {
createdFullName: request.user.name, createdFullName: request.user.name,
updateUserId: request.user.sub, updateUserId: request.user.sub,
updateFullName: request.user.name, updateFullName: request.user.name,
})) }));
await this.assignSkillRepository.save(skills) await this.assignSkillRepository.save(skills);
await this.assignCompetencyRepository.delete({ assign_id }) await this.assignCompetencyRepository.delete({ assign_id });
const competencise = await requestBody.assign_competency.map((x: CreateAssignCompetency, index: number) => ({ const competencise = await requestBody.assign_competency.map(
(x: CreateAssignCompetency, index: number) => ({
competency_id: x.id, competency_id: x.id,
competency_level: x.level, competency_level: x.level,
competency_name: x.name, competency_name: x.name,
@ -287,11 +323,13 @@ export class AssignController extends Controller {
createdFullName: request.user.name, createdFullName: request.user.name,
updateUserId: request.user.sub, updateUserId: request.user.sub,
updateFullName: request.user.name, updateFullName: request.user.name,
})) }),
await this.assignCompetencyRepository.save(competencise) );
await this.assignCompetencyRepository.save(competencise);
await this.assignCompetencyGroupRepository.delete({ assign_id }) await this.assignCompetencyGroupRepository.delete({ assign_id });
const competencyGroups = await requestBody.assign_competency_group.map((x: CreateAssignCompetencyGroup, index: number) => ({ const competencyGroups = await requestBody.assign_competency_group.map(
(x: CreateAssignCompetencyGroup, index: number) => ({
competency_group_id: x.id, competency_group_id: x.id,
competency_group_level: x.level, competency_group_level: x.level,
competency_group_name: x.name, competency_group_name: x.name,
@ -301,11 +339,13 @@ export class AssignController extends Controller {
createdFullName: request.user.name, createdFullName: request.user.name,
updateUserId: request.user.sub, updateUserId: request.user.sub,
updateFullName: request.user.name, updateFullName: request.user.name,
})) }),
await this.assignCompetencyGroupRepository.save(competencyGroups) );
await this.assignCompetencyGroupRepository.save(competencyGroups);
await this.assignOutputRepository.delete({ assign_id }) await this.assignOutputRepository.delete({ assign_id });
const outputs = await requestBody.assign_outputs.map((x: CreateAssignOutput, index: number) => ({ const outputs = await requestBody.assign_outputs.map(
(x: CreateAssignOutput, index: number) => ({
...x, ...x,
id: index + 1, id: index + 1,
assign_id: assign.id, assign_id: assign.id,
@ -313,11 +353,13 @@ export class AssignController extends Controller {
createdFullName: request.user.name, createdFullName: request.user.name,
updateUserId: request.user.sub, updateUserId: request.user.sub,
updateFullName: request.user.name, updateFullName: request.user.name,
})) }),
await this.assignOutputRepository.save(outputs) );
await this.assignOutputRepository.save(outputs);
await this.assignDirectorRepository.delete({ assign_id }) await this.assignDirectorRepository.delete({ assign_id });
const directors = await requestBody.assign_director.map((x: CreateAssignDirector, index: number) => ({ const directors = await requestBody.assign_director.map(
(x: CreateAssignDirector, index: number) => ({
...x, ...x,
assign_id: assign.id, assign_id: assign.id,
fullname: x.name, fullname: x.name,
@ -326,18 +368,19 @@ export class AssignController extends Controller {
createdFullName: request.user.name, createdFullName: request.user.name,
updateUserId: request.user.sub, updateUserId: request.user.sub,
updateFullName: request.user.name, updateFullName: request.user.name,
})) }),
await this.assignDirectorRepository.save(directors) );
await this.assignDirectorRepository.save(directors);
await this.assignRepository.save(data, { data: request }) await this.assignRepository.save(data, { data: request });
setLogDataDiff(request, { before, after: data }) setLogDataDiff(request, { before, after: data });
// #noted cronjob // #noted cronjob
// แจ้งผู้ดูแลและผู้บังคับบัญชาเข้ามาบันทึกผลทุก 2 เดือน // แจ้งผู้ดูแลและผู้บังคับบัญชาเข้ามาบันทึกผลทุก 2 เดือน
const dateSaveForm = await findEndDate(2, requestBody.date_start) const dateSaveForm = await findEndDate(2, requestBody.date_start);
requestBody.assign_director requestBody.assign_director
.filter(x => x.role == "mentor" || x.role == "commander") .filter((x) => x.role == "mentor" || x.role == "commander")
.map(async director => { .map(async (director) => {
await new CallAPI() await new CallAPI()
.PostData(request, "/placement/noti", { .PostData(request, "/placement/noti", {
subject: `ถึงกำหนดบันทึกผลการทดลองปฏิบัติหน้าที่ราชการครั้งที่ 1 ${requestBody.fullname}`, subject: `ถึงกำหนดบันทึกผลการทดลองปฏิบัติหน้าที่ราชการครั้งที่ 1 ${requestBody.fullname}`,
@ -348,16 +391,16 @@ export class AssignController extends Controller {
isSendInbox: true, isSendInbox: true,
receiveDate: dateSaveForm, receiveDate: dateSaveForm,
}) })
.catch(error => { .catch((error) => {
console.error("Error calling API:", error) console.error("Error calling API:", error);
}) });
}) });
// แจ้งผู้บังคับบัญชา และคณะกรรมการเข้ามาประเมินทุก 3 เดือน // แจ้งผู้บังคับบัญชา และคณะกรรมการเข้ามาประเมินทุก 3 เดือน
const dateEvaluate = await findEndDate(3, requestBody.date_start) const dateEvaluate = await findEndDate(3, requestBody.date_start);
requestBody.assign_director requestBody.assign_director
.filter(x => x.role == "commander" || x.role == "chairman") .filter((x) => x.role == "commander" || x.role == "chairman")
.map(async director => { .map(async (director) => {
await new CallAPI() await new CallAPI()
.PostData(request, "/placement/noti", { .PostData(request, "/placement/noti", {
subject: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการครั้งที่ 1 ${requestBody.fullname}`, subject: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการครั้งที่ 1 ${requestBody.fullname}`,
@ -368,16 +411,16 @@ export class AssignController extends Controller {
isSendInbox: true, isSendInbox: true,
receiveDate: dateEvaluate, receiveDate: dateEvaluate,
}) })
.catch(error => { .catch((error) => {
console.error("Error calling API:", error) console.error("Error calling API:", error);
}) });
}) });
// แจ้งประธาน 6 เดือน // แจ้งประธาน 6 เดือน
const dateResult = await findEndDate(6, requestBody.date_start) const dateResult = await findEndDate(6, requestBody.date_start);
requestBody.assign_director requestBody.assign_director
.filter(x => x.role == "chairman") .filter((x) => x.role == "chairman")
.map(async director => { .map(async (director) => {
await new CallAPI() await new CallAPI()
.PostData(request, "/placement/noti", { .PostData(request, "/placement/noti", {
subject: `ถึงกำหนดรายงานการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ ${requestBody.fullname}`, subject: `ถึงกำหนดรายงานการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ ${requestBody.fullname}`,
@ -389,12 +432,12 @@ export class AssignController extends Controller {
// isSendNotification: true // isSendNotification: true
receiveDate: dateResult, receiveDate: dateResult,
}) })
.catch(error => { .catch((error) => {
console.error("Error calling API:", error) console.error("Error calling API:", error);
}) });
}) });
return new HttpSuccess() return new HttpSuccess();
} }
/** /**
@ -405,51 +448,51 @@ export class AssignController extends Controller {
*/ */
@Get("assign-list") @Get("assign-list")
async ListPersonal(@Request() request: RequestWithUser, @Query() personal_id: string) { async ListPersonal(@Request() request: RequestWithUser, @Query() personal_id: string) {
let _workflow = await new permission().Workflow(request, personal_id, "SYS_PROBATION") let _workflow = await new permission().Workflow(request, personal_id, "SYS_PROBATION");
if (_workflow == false) await new permission().PermissionGet(request, "SYS_PROBATION") if (_workflow == false) await new permission().PermissionGet(request, "SYS_PROBATION");
const lists = await this.assignRepository.find({ const lists = await this.assignRepository.find({
select: ["id", "round_no", "date_start", "date_finish"], select: ["id", "round_no", "date_start", "date_finish"],
where: { personal_id }, where: { personal_id },
order: { round_no: "ASC" }, order: { round_no: "ASC" },
}) });
let result: any = [] let result: any = [];
await Promise.all( await Promise.all(
lists.map(async item => { lists.map(async (item) => {
const director = await this.assignDirectorRepository.find({ const director = await this.assignDirectorRepository.find({
where: { assign_id: item.id }, where: { assign_id: item.id },
order: { ordering: "ASC" }, order: { ordering: "ASC" },
}) });
let mentors = "" let mentors = "";
const mentorList = await director.filter(x => x.role == "mentor") const mentorList = await director.filter((x) => x.role == "mentor");
if (mentorList.length > 0) { if (mentorList.length > 0) {
for (let index = 0; index < mentorList.length; index++) { for (let index = 0; index < mentorList.length; index++) {
const e = await mentorList[index] const e = await mentorList[index];
mentors += e.fullname mentors += e.fullname;
if (index < mentorList.length - 1) { if (index < mentorList.length - 1) {
mentors += ", " mentors += ", ";
} }
} }
} }
const commanderData = await (director.find(x => x.role == "commander") ?? null) const commanderData = await (director.find((x) => x.role == "commander") ?? null);
const commander = commanderData ? commanderData.fullname : null const commander = commanderData ? commanderData.fullname : null;
const chairmanData = await (director.find(x => x.role == "chairman") ?? null) const chairmanData = await (director.find((x) => x.role == "chairman") ?? null);
const chairman = chairmanData ? chairmanData.fullname : null const chairman = chairmanData ? chairmanData.fullname : null;
await result.push({ await result.push({
...item, ...item,
mentors: mentors, mentors: mentors,
commander: commander, commander: commander,
chairman: chairman, chairman: chairman,
}) });
}) }),
) );
return new HttpSuccess(result) return new HttpSuccess(result);
} }
/** /**
@ -464,45 +507,45 @@ export class AssignController extends Controller {
select: ["id", "round_no", "date_start", "date_finish"], select: ["id", "round_no", "date_start", "date_finish"],
where: { personal_id }, where: { personal_id },
order: { round_no: "ASC" }, order: { round_no: "ASC" },
}) });
let result: any = [] let result: any = [];
await Promise.all( await Promise.all(
lists.map(async item => { lists.map(async (item) => {
const director = await this.assignDirectorRepository.find({ const director = await this.assignDirectorRepository.find({
where: { assign_id: item.id }, where: { assign_id: item.id },
order: { ordering: "ASC" }, order: { ordering: "ASC" },
}) });
let mentors = "" let mentors = "";
const mentorList = await director.filter(x => x.role == "mentor") const mentorList = await director.filter((x) => x.role == "mentor");
if (mentorList.length > 0) { if (mentorList.length > 0) {
for (let index = 0; index < mentorList.length; index++) { for (let index = 0; index < mentorList.length; index++) {
const e = await mentorList[index] const e = await mentorList[index];
mentors += e.fullname mentors += e.fullname;
if (index < mentorList.length - 1) { if (index < mentorList.length - 1) {
mentors += ", " mentors += ", ";
} }
} }
} }
const commanderData = await (director.find(x => x.role == "commander") ?? null) const commanderData = await (director.find((x) => x.role == "commander") ?? null);
const commander = commanderData ? commanderData.fullname : null const commander = commanderData ? commanderData.fullname : null;
const chairmanData = await (director.find(x => x.role == "chairman") ?? null) const chairmanData = await (director.find((x) => x.role == "chairman") ?? null);
const chairman = chairmanData ? chairmanData.fullname : null const chairman = chairmanData ? chairmanData.fullname : null;
await result.push({ await result.push({
...item, ...item,
mentors: mentors, mentors: mentors,
commander: commander, commander: commander,
chairman: chairman, chairman: chairman,
}) });
}) }),
) );
return new HttpSuccess(result) return new HttpSuccess(result);
} }
/** /**
@ -513,8 +556,8 @@ export class AssignController extends Controller {
*/ */
@Get("") @Get("")
async GetAssign(@Query() assign_id: string, @Request() request: RequestWithUser) { async GetAssign(@Query() assign_id: string, @Request() request: RequestWithUser) {
let _workflow = await new permission().Workflow(request, assign_id, "SYS_PROBATION") let _workflow = await new permission().Workflow(request, assign_id, "SYS_PROBATION");
if (_workflow == false) await new permission().PermissionGet(request, "SYS_PROBATION") if (_workflow == false) await new permission().PermissionGet(request, "SYS_PROBATION");
const assign = await this.assignRepository.findOne({ const assign = await this.assignRepository.findOne({
select: [ select: [
@ -534,42 +577,54 @@ export class AssignController extends Controller {
"reportPersonId", "reportPersonId",
], ],
where: { id: assign_id }, where: { id: assign_id },
}) });
if (!assign) { if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน") throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
} }
const profileData = await this.personalRepository.findOne({ const profileData = await this.personalRepository.findOne({
select: ["personal_id", "prefixName", "firstName", "lastName", "positionName", "positionLevelName", "positionLineName", "orgRootName", "organization"], select: [
"personal_id",
"prefixName",
"firstName",
"lastName",
"positionName",
"positionLevelName",
"positionLineName",
"orgRootName",
"organization",
],
where: { where: {
personal_id: assign.personal_id, personal_id: assign.personal_id,
}, },
}) });
if (!profileData) { if (!profileData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล") throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล");
} }
const splitOc = await profileData.organization.split("/");
const splitOcAmount = await splitOc.length;
const profile = { const profile = {
...profileData, ...profileData,
name: `${profileData.prefixName}${profileData.firstName} ${profileData.lastName}`, name: `${profileData.prefixName}${profileData.firstName} ${profileData.lastName}`,
Position: profileData.positionName, Position: profileData.positionName,
Department: "-", Department: splitOcAmount > 2 ? splitOc[splitOcAmount - 3] : "-",
OrganizationOrganization: profileData.orgRootName, OrganizationOrganization: splitOcAmount > 1 ? splitOc[splitOcAmount - 2] : "-",
Oc: profileData.organization, Oc: profileData.orgRootName,
} };
const jobs = await this.assignJobRepository.find({ const jobs = await this.assignJobRepository.find({
select: ["id", "activity_desc", "goal_desc"], select: ["id", "activity_desc", "goal_desc"],
where: { assign_id }, where: { assign_id },
}) });
const knowledgeData = await this.assignKnowledgeRepository.find({ const knowledgeData = await this.assignKnowledgeRepository.find({
relations: ["knowledge"], relations: ["knowledge"],
where: { assign_id }, where: { assign_id },
}) });
const knowledges = await knowledgeData.map(x => ({ const knowledges = await knowledgeData.map((x) => ({
id: x.knowledge_id, id: x.knowledge_id,
level: x.knowledge_level, level: x.knowledge_level,
title: x.knowledge.title, title: x.knowledge.title,
@ -585,34 +640,34 @@ export class AssignController extends Controller {
: x.knowledge_level == 5 : x.knowledge_level == 5
? x.knowledge.level5 ? x.knowledge.level5
: "", : "",
})) }));
const lawData = await this.lawsRepository.find({ const lawData = await this.lawsRepository.find({
where: { active: 1 }, where: { active: 1 },
}) });
const laws = await Promise.all( const laws = await Promise.all(
lawData.map(async x => { lawData.map(async (x) => {
const assignLaw = await this.assignLawRepository.countBy({ const assignLaw = await this.assignLawRepository.countBy({
assign_id: assign_id, assign_id: assign_id,
law_id: x.id, law_id: x.id,
}) });
return { return {
id: x.id, id: x.id,
selected: assignLaw > 0 ? 1 : 0, selected: assignLaw > 0 ? 1 : 0,
description: x.description, description: x.description,
status_select: x.status_select, status_select: x.status_select,
} };
}) }),
) );
const skillsData = await this.assignSkillRepository.find({ const skillsData = await this.assignSkillRepository.find({
relations: ["skill"], relations: ["skill"],
where: { assign_id }, where: { assign_id },
}) });
const skills = await skillsData.map(x => ({ const skills = await skillsData.map((x) => ({
id: x.skill_id, id: x.skill_id,
level: x.skill_level, level: x.skill_level,
title: x.skill.title, title: x.skill.title,
@ -628,74 +683,90 @@ export class AssignController extends Controller {
: x.skill_level == 5 : x.skill_level == 5
? x.skill.level5 ? x.skill.level5
: "", : "",
})) }));
const competencyData = await this.assignCompetencyRepository.find({ const competencyData = await this.assignCompetencyRepository.find({
select: ["competency_id", "competency_level", "competency_name", "competency_description"], select: ["competency_id", "competency_level", "competency_name", "competency_description"],
where: { assign_id }, where: { assign_id },
}) });
const competencys = await competencyData.map(x => ({ const competencys = await competencyData.map((x) => ({
id: x.competency_id, id: x.competency_id,
level: x.competency_level, level: x.competency_level,
name: x.competency_name, name: x.competency_name,
description: x.competency_description, description: x.competency_description,
})) }));
const competencyGroupData = await this.assignCompetencyGroupRepository.find({ const competencyGroupData = await this.assignCompetencyGroupRepository.find({
select: ["competency_group_id", "competency_group_level", "competency_group_name", "competency_group_description"], select: [
"competency_group_id",
"competency_group_level",
"competency_group_name",
"competency_group_description",
],
where: { assign_id }, where: { assign_id },
}) });
const competency_groups = await competencyGroupData.map(x => ({ const competency_groups = await competencyGroupData.map((x) => ({
id: x.competency_group_id, id: x.competency_group_id,
level: x.competency_group_level, level: x.competency_group_level,
name: x.competency_group_name, name: x.competency_group_name,
description: x.competency_group_description, description: x.competency_group_description,
})) }));
const outputs = await this.assignOutputRepository.find({ const outputs = await this.assignOutputRepository.find({
select: ["id", "output_desc", "indicator_desc"], select: ["id", "output_desc", "indicator_desc"],
where: { assign_id }, where: { assign_id },
}) });
const director = await this.assignDirectorRepository.find({ const director = await this.assignDirectorRepository.find({
where: { assign_id }, where: { assign_id },
order: { ordering: "ASC" }, order: { ordering: "ASC" },
}) });
let mentors = [] let mentors = [];
const mentorList = await director.filter(x => x.role == "mentor") const mentorList = await director.filter((x) => x.role == "mentor");
if (mentorList.length > 0) { if (mentorList.length > 0) {
for (let index = 0; index < mentorList.length; index++) { for (let index = 0; index < mentorList.length; index++) {
const e = await mentorList[index] const e = await mentorList[index];
mentors.push({ mentors.push({
...e, ...e,
name: e.fullname, name: e.fullname,
label: e.fullname + " " + (e.position ? `(${e.position}, ${e.posType}: ${e.posLevel})` : ""), label:
Position: e.position, // report e.fullname + " " + (e.position ? `(${e.position}, ${e.posType}: ${e.posLevel})` : ""),
}) Position: e.position + e.posLevel, // report
});
} }
} }
const commanderData = await (director.find(x => x.role == "commander") ?? null) const commanderData = await (director.find((x) => x.role == "commander") ?? null);
const commander = await (commanderData const commander = await (commanderData
? { ? {
...commanderData, ...commanderData,
name: commanderData.fullname, name: commanderData.fullname,
label: commanderData.fullname + " " + (commanderData.position ? `(${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})` : ""), label:
Position: commanderData.position, // report commanderData.fullname +
" " +
(commanderData.position
? `(${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})`
: ""),
Position: commanderData.position + commanderData.posLevel, // report
} }
: null) : null);
const chairmanData = await (director.find(x => x.role == "chairman") ?? null) const chairmanData = await (director.find((x) => x.role == "chairman") ?? null);
const chairman = await (chairmanData const chairman = await (chairmanData
? { ? {
...chairmanData, ...chairmanData,
name: chairmanData.fullname, name: chairmanData.fullname,
label: chairmanData.fullname + " " + (chairmanData.position ? `(${chairmanData.position}, ${chairmanData.posType}: ${chairmanData.posLevel})` : ""), label:
Position: chairmanData.position, // report chairmanData.fullname +
" " +
(chairmanData.position
? `(${chairmanData.position}, ${chairmanData.posType}: ${chairmanData.posLevel})`
: ""),
Position: chairmanData.position + chairmanData.posLevel, // report
} }
: null) : null);
return new HttpSuccess({ return new HttpSuccess({
assign, assign,
@ -710,6 +781,6 @@ export class AssignController extends Controller {
mentors, mentors,
commander, commander,
chairman, chairman,
}) });
} }
} }

File diff suppressed because it is too large Load diff