Merge branch 'develop' into dev

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-09-16 15:00:08 +07:00
commit e6cf5d312a
19 changed files with 7074 additions and 6019 deletions

33
package-lock.json generated
View file

@ -28,7 +28,8 @@
"swagger-ui-express": "^5.0.0",
"tsoa": "^6.0.1",
"typeorm": "^0.3.19",
"typeorm-cli": "^1.0.7"
"typeorm-cli": "^1.0.7",
"ws": "^8.18.1"
},
"devDependencies": {
"@types/amqplib": "^0.10.5",
@ -37,6 +38,7 @@
"@types/node": "^20.11.5",
"@types/node-cron": "^3.0.11",
"@types/swagger-ui-express": "^4.1.6",
"@types/ws": "^8.5.14",
"nodemon": "^3.0.3",
"prettier": "^3.2.2",
"ts-node": "^10.9.2",
@ -866,6 +868,15 @@
"@types/serve-static": "*"
}
},
"node_modules/@types/ws": {
"version": "8.5.14",
"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.14.tgz",
"integrity": "sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw==",
"dev": true,
"dependencies": {
"@types/node": "*"
}
},
"node_modules/@types/zen-observable": {
"version": "0.8.3",
"resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.3.tgz",
@ -5769,6 +5780,26 @@
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
},
"node_modules/ws": {
"version": "8.18.1",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz",
"integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==",
"engines": {
"node": ">=10.0.0"
},
"peerDependencies": {
"bufferutil": "^4.0.1",
"utf-8-validate": ">=5.0.2"
},
"peerDependenciesMeta": {
"bufferutil": {
"optional": true
},
"utf-8-validate": {
"optional": true
}
}
},
"node_modules/xml2js": {
"version": "0.4.23",
"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",

View file

@ -22,6 +22,7 @@
"@types/node": "^20.11.5",
"@types/node-cron": "^3.0.11",
"@types/swagger-ui-express": "^4.1.6",
"@types/ws": "^8.5.14",
"nodemon": "^3.0.3",
"prettier": "^3.2.2",
"ts-node": "^10.9.2",
@ -47,6 +48,7 @@
"swagger-ui-express": "^5.0.0",
"tsoa": "^6.0.1",
"typeorm": "^0.3.19",
"typeorm-cli": "^1.0.7"
"typeorm-cli": "^1.0.7",
"ws": "^8.18.1"
}
}

View file

@ -18,7 +18,7 @@ async function main() {
app.use(
cors({
origin: "*",
}),
})
);
app.use(express.json());
app.use(express.urlencoded({ extended: true }));
@ -36,16 +36,37 @@ async function main() {
const params = new URLSearchParams(req.query as Record<string, string>);
const newUrl = params.toString() ? `${id}?${params.toString()}` : id;
const APIAPI_DASHBOARD = `${process.env.API_DASHBOARD}/generate-pdf`;
const body = `${process.env.API_DASHBOARD}/d/${newUrl}`;
const API_DASHBOARD = `${process.env.VITE_API_REPORT_URL}/html`;
const url = `${process.env.VITE_DASHBOARD_PANEL}/d/${newUrl}&kiosk`;
try {
// เรียก API generate-pdf
const apiResponse = await axios.post(APIAPI_DASHBOARD, { url: body });
const apiResponse = await axios.post(
API_DASHBOARD,
{
template: url,
reportName: "dashboard_report",
htmlOption: {
querySelector: ".dashboard-content",
},
},
{
headers: {
"Content-Type": "application/json",
accept: "application/pdf",
},
responseType: "arraybuffer",
}
);
// console.log("Response:", apiResponse.data.pdfUrl);
console.log("Response:", apiResponse.data);
res.redirect(apiResponse.data.pdfUrl);
const pdfBuffer = Buffer.from(apiResponse.data, "binary");
res.set({
"Content-Type": "application/pdf",
"Content-Disposition": "attachment; filename=dashboard.pdf",
});
res.send(pdfBuffer);
} catch (error) {
throw new Error("Failed to generate PDF: " + error);
}
@ -61,9 +82,11 @@ async function main() {
APP_PORT,
APP_HOST,
() => (
console.log(`[APP] Application is running on: http://localhost:${APP_PORT}`),
console.log(
`[APP] Application is running on: http://localhost:${APP_PORT}`
),
console.log(`[APP] Swagger on: http://localhost:${APP_PORT}/api-docs`)
),
)
);
}

View file

@ -50,6 +50,19 @@ export class AppointController extends Controller {
@Query("pageSize") pageSize: number = 10,
@Request() request: RequestWithUser,
) {
try {
const appoint = await this.appointRepository.find({
relations: ["personal", "directors"],
where: { createdUserId: request.user.sub },
// where: { personal: conditions },
});
return new HttpSuccess(appoint);
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
// await new permission().PermissionList(request, "SYS_PROBATION")
// const _data = await new permission().PermissionOrgList(request, "SYS_PROBATION")
@ -74,14 +87,6 @@ export class AppointController extends Controller {
// if (_data.child4 != undefined && _data.child4 != null && _data.child4[0] != null) {
// conditions.child4 = _data.child4
// }
const appoint = await this.appointRepository.find({
relations: ["personal", "directors"],
where: { createdUserId: request.user.sub },
// where: { personal: conditions },
});
return new HttpSuccess(appoint);
}
/**
@ -92,12 +97,18 @@ export class AppointController extends Controller {
*/
@Get("list/{id}")
async GetListCommand(@Request() request: RequestWithUser, @Path() id: string) {
const appoint = await this.appointRepository.find({
relations: ["directors"],
where: { profileId: id, status: "DONE" },
});
try {
const appoint = await this.appointRepository.find({
relations: ["directors"],
where: { profileId: id, status: "DONE" },
});
return new HttpSuccess(appoint);
return new HttpSuccess(appoint);
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
}
/**
@ -108,19 +119,27 @@ export class AppointController extends Controller {
*/
@Post("")
async Create(@Request() request: RequestWithUser, @Body() requestBody: CreateAppoint) {
await new permission().PermissionCreate(request, "SYS_PROBATION");
try {
await new permission().PermissionCreate(request, "SYS_PROBATION");
const data: any = {
topic: requestBody.topic,
profileId: requestBody.profileId,
createdUserId: request.user.sub,
createdFullName: request.user.name,
};
const before = null;
const appoint = await this.appointRepository.save(data, { data: request });
setLogDataDiff(request, { before, after: appoint });
const data: any = {
topic: requestBody.topic,
profileId: requestBody.profileId,
createdUserId: request.user.sub,
createdFullName: request.user.name,
};
const before = null;
const appoint = await this.appointRepository.save(data, {
data: request,
});
setLogDataDiff(request, { before, after: appoint });
return new HttpSuccess(appoint.id);
return new HttpSuccess(appoint.id);
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
}
/**
@ -131,16 +150,22 @@ export class AppointController extends Controller {
*/
@Get("{id}")
async GetById(@Request() request: RequestWithUser, @Path() id: string) {
let _workflow = await new permission().Workflow(request, id, "SYS_PROBATION");
if (_workflow == false) await new permission().PermissionGet(request, "SYS_PROBATION");
try {
let _workflow = await new permission().Workflow(request, id, "SYS_PROBATION");
if (_workflow == false) await new permission().PermissionGet(request, "SYS_PROBATION");
const appoint = await this.appointRepository.findOne({
select: ["id", "topic", "status", "profileId"],
where: { id },
relations: ["directors"],
});
const appoint = await this.appointRepository.findOne({
select: ["id", "topic", "status", "profileId"],
where: { id },
relations: ["directors"],
});
return new HttpSuccess(appoint);
return new HttpSuccess(appoint);
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
}
/**
@ -155,36 +180,42 @@ export class AppointController extends Controller {
@Body() requestBody: UpdateAppoint,
@Path() id: string,
) {
await new permission().PermissionUpdate(request, "SYS_PROBATION");
try {
await new permission().PermissionUpdate(request, "SYS_PROBATION");
const appoint: any = await this.appointRepository.findOne({
where: { id },
});
const appoint: any = await this.appointRepository.findOne({
where: { id },
});
if (!appoint) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการแต่งตั้งคณะกรรมการฯ");
if (!appoint) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการแต่งตั้งคณะกรรมการฯ");
}
const before = appoint;
appoint.topic = requestBody.topic;
appoint.updateUserId = request.user.sub;
appoint.updateFullName = request.user.name;
await this.appointDirectorRepository.delete({ appointId: id });
const directors: any = await requestBody.persons.map((x: Person) => ({
...x,
appointId: id,
createdUserId: request.user.sub,
createdFullName: request.user.name,
updateUserId: request.user.sub,
updateFullName: request.user.name,
}));
await this.appointDirectorRepository.save(directors);
await this.appointRepository.save(appoint, { data: request });
setLogDataDiff(request, { before, after: appoint });
return new HttpSuccess();
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
const before = appoint;
appoint.topic = requestBody.topic;
appoint.updateUserId = request.user.sub;
appoint.updateFullName = request.user.name;
await this.appointDirectorRepository.delete({ appointId: id });
const directors: any = await requestBody.persons.map((x: Person) => ({
...x,
appointId: id,
createdUserId: request.user.sub,
createdFullName: request.user.name,
updateUserId: request.user.sub,
updateFullName: request.user.name,
}));
await this.appointDirectorRepository.save(directors);
await this.appointRepository.save(appoint, { data: request });
setLogDataDiff(request, { before, after: appoint });
return new HttpSuccess();
}
/**
@ -195,14 +226,20 @@ export class AppointController extends Controller {
*/
@Delete("{id}")
public async deleteRole(@Path() id: string, @Request() request: RequestWithUser) {
await new permission().PermissionDelete(request, "SYS_PROBATION");
try {
await new permission().PermissionDelete(request, "SYS_PROBATION");
await this.appointDirectorRepository.delete({ appointId: id });
await this.appointDirectorRepository.delete({ appointId: id });
const result = await this.appointRepository.delete({ id });
if (!result) throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
const result = await this.appointRepository.delete({ id });
if (!result) throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
return new HttpSuccess();
return new HttpSuccess();
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
}
/**
@ -213,27 +250,33 @@ export class AppointController extends Controller {
*/
@Get("/committee/{profileId}")
async GetCheckById(@Request() request: RequestWithUser, @Path() profileId: string) {
await new permission().PermissionGet(request, "SYS_PROBATION");
try {
await new permission().PermissionGet(request, "SYS_PROBATION");
const directorId = await new CallAPI()
.GetData(request, "/org/profile/keycloak")
.catch((error) => {
console.error("Error calling API:", error);
});
const directorId = await new CallAPI()
.GetData(request, "/org/profile/keycloak")
.catch((error) => {
console.error("Error calling API:", error);
});
const appoint = await AppDataSource.getRepository(Appoint)
.createQueryBuilder("appoint")
.leftJoinAndSelect("appoint.directors", "directors")
.where(
"appoint.profileId = :profileId and directors.profileId = :directorId and directors.role = 'committee'",
{
directorId,
profileId,
},
)
.orderBy("appoint.createdAt", "DESC")
.getOne();
const check = appoint ? true : false;
return new HttpSuccess(check);
const appoint = await AppDataSource.getRepository(Appoint)
.createQueryBuilder("appoint")
.leftJoinAndSelect("appoint.directors", "directors")
.where(
"appoint.profileId = :profileId and directors.profileId = :directorId and directors.role = 'committee'",
{
directorId,
profileId,
},
)
.orderBy("appoint.createdAt", "DESC")
.getOne();
const check = appoint ? true : false;
return new HttpSuccess(check);
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
}
}

File diff suppressed because it is too large Load diff

View file

@ -2,6 +2,8 @@ import { Controller, Route, Security, Tags, Request, Get, Path } from "tsoa";
import { RequestWithUser } from "../middlewares/user";
import { AppDataSource } from "../database/data-source";
import HttpSuccess from "../interfaces/http-success";
import HttpError from "../interfaces/http-error";
import HttpStatusCode from "../interfaces/http-status";
import CallAPI from "../interfaces/call-api";
import { AssignDirector } from "../entities/AssignDirector";
@ -16,54 +18,60 @@ export class AssignPermissionsController extends Controller {
@Get("{id}")
async GetAssignPermissions(@Request() request: RequestWithUser, @Path() id: string) {
const director = await this.assignDirector.find({
where: { assign_id: id },
});
const personalId = await new CallAPI()
.GetData(request, "/org/profile/keycloak")
.catch((error) => {
console.error("Error calling API:", error);
try {
const director = await this.assignDirector.find({
where: { assign_id: id },
});
const role = await director.find((e: any) => e.personal_id === personalId)?.role;
const personalId = await new CallAPI()
.GetData(request, "/org/profile/keycloak")
.catch((error) => {
console.error("Error calling API:", error);
});
const reportPersonId = await this.assignRepository.findOneBy({
id,
reportPersonId: personalId,
});
const role = await director.find((e: any) => e.personal_id === personalId)?.role;
const response = {
tab1: {
isEdit: role === "commander",
isView: true,
},
tab2: {
isEdit: role === "mentor",
isView: true,
},
tab3: {
isEdit: role === "commander",
isView: role === "commander" || role === "chairman",
},
tab4: {
isEdit: role === "commander",
isView: role === "commander" || role === "chairman",
},
tab5: {
isEdit: Boolean(reportPersonId),
isView: true,
},
tab6: {
isEdit: true,
isView: true,
},
tab7: {
isEdit: false,
isView: true,
},
};
const reportPersonId = await this.assignRepository.findOneBy({
id,
reportPersonId: personalId,
});
return new HttpSuccess(response);
const response = {
tab1: {
isEdit: role === "commander",
isView: true,
},
tab2: {
isEdit: role === "mentor",
isView: true,
},
tab3: {
isEdit: role === "commander",
isView: role === "commander" || role === "chairman",
},
tab4: {
isEdit: role === "commander",
isView: role === "commander" || role === "chairman",
},
tab5: {
isEdit: Boolean(reportPersonId),
isView: true,
},
tab6: {
isEdit: true,
isView: true,
},
tab7: {
isEdit: false,
isView: true,
},
};
return new HttpSuccess(response);
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
}
}

View file

@ -1,32 +1,53 @@
import { Controller, Route, Security, Tags, Request, SuccessResponse, Response, Get, Post, Body } from "tsoa"
import HttpSuccess from "../interfaces/http-success"
import HttpStatusCode from "../interfaces/http-status"
import { RequestWithUser } from "../middlewares/user"
import { findEndDate } from "../interfaces/utils"
import {
Controller,
Route,
Security,
Tags,
Request,
SuccessResponse,
Response,
Get,
Post,
Body,
} from "tsoa";
import HttpSuccess from "../interfaces/http-success";
import HttpStatusCode from "../interfaces/http-status";
import HttpError from "../interfaces/http-error";
import { RequestWithUser } from "../middlewares/user";
import { findEndDate } from "../interfaces/utils";
@Route("api/v1/probation/calculate")
@Tags("ฟอร์มมอบหมายงาน")
@Security("bearerAuth")
@Response(HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง")
@Response(
HttpStatusCode.INTERNAL_SERVER_ERROR,
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง",
)
export class CalculateController extends Controller {
/**
* API
*
* @summary
*
*/
@Post("assign-finish")
async AssignFinish(
@Body()
requestBody: {
month: number
start_date: Date
},
@Request() request: RequestWithUser
) {
const { month, start_date } = requestBody
const finish_date = findEndDate(month, start_date)
/**
* API
*
* @summary
*
*/
@Post("assign-finish")
async AssignFinish(
@Body()
requestBody: {
month: number;
start_date: Date;
},
@Request() request: RequestWithUser,
) {
try {
const { month, start_date } = requestBody;
const finish_date = findEndDate(month, start_date);
return new HttpSuccess({ finish_date })
}
return new HttpSuccess({ finish_date });
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
}
}

View file

@ -1,356 +1,408 @@
import { Controller, Route, Security, Tags, Request, SuccessResponse, Response, Get, Query } from "tsoa"
import { AppDataSource } from "../database/data-source"
import HttpSuccess from "../interfaces/http-success"
import HttpStatusCode from "../interfaces/http-status"
import HttpError from "../interfaces/http-error"
import { RequestWithUser } from "../middlewares/user"
import { Knowledge, TypeKnowledge } from "../entities/Knowledge"
import { Skill, TypeSkill } from "../entities/Skill"
import { MapKnowledgeSkill } from "../entities/MapKnowledgeSkill"
import { Personal } from "../entities/Personal"
import { Law } from "../entities/Law"
import { Assign } from "../entities/Assign"
import permission from "../interfaces/permission"
import {
Controller,
Route,
Security,
Tags,
Request,
SuccessResponse,
Response,
Get,
Query,
} from "tsoa";
import { AppDataSource } from "../database/data-source";
import HttpSuccess from "../interfaces/http-success";
import HttpStatusCode from "../interfaces/http-status";
import HttpError from "../interfaces/http-error";
import { RequestWithUser } from "../middlewares/user";
import { Knowledge, TypeKnowledge } from "../entities/Knowledge";
import { Skill, TypeSkill } from "../entities/Skill";
import { MapKnowledgeSkill } from "../entities/MapKnowledgeSkill";
import { Personal } from "../entities/Personal";
import { Law } from "../entities/Law";
import { Assign } from "../entities/Assign";
import permission from "../interfaces/permission";
@Route("api/v1/probation/data-options")
@Tags("Data Options")
@Security("bearerAuth")
@Response(HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง")
@Response(
HttpStatusCode.INTERNAL_SERVER_ERROR,
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง",
)
export class DataOptionController extends Controller {
private personalRepository = AppDataSource.getRepository(Personal)
private knowledgeRepository = AppDataSource.getRepository(Knowledge)
private mapKnowledgeSkillRepository = AppDataSource.getRepository(MapKnowledgeSkill)
private skillRepository = AppDataSource.getRepository(Skill)
private lawRepository = AppDataSource.getRepository(Law)
private assignRepository = AppDataSource.getRepository(Assign)
private personalRepository = AppDataSource.getRepository(Personal);
private knowledgeRepository = AppDataSource.getRepository(Knowledge);
private mapKnowledgeSkillRepository = AppDataSource.getRepository(MapKnowledgeSkill);
private skillRepository = AppDataSource.getRepository(Skill);
private lawRepository = AppDataSource.getRepository(Law);
private assignRepository = AppDataSource.getRepository(Assign);
/**
* API list
*
* @summary options
*
*/
@Get("knowledge")
async GetKnowledge(@Query() personal_id: string) {
const person = await this.personalRepository.findOne({
where: { personal_id },
})
/**
* API list
*
* @summary options
*
*/
@Get("knowledge")
async GetKnowledge(@Query() personal_id: string) {
try {
const person = await this.personalRepository.findOne({
where: { personal_id },
});
if (!person) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล")
}
if (!person) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล");
}
let result = await this.mapKnowledgeSkillRepository.findOne({
where: {
positionName: person.positionName,
positionLevelName: person.positionLevelName,
active: 1,
},
})
let result = await this.mapKnowledgeSkillRepository.findOne({
where: {
positionName: person.positionName,
positionLevelName: person.positionLevelName,
active: 1,
},
});
if (!result) {
// ถ้าตำแหน่งไม่ตรงหาจากระดับตำแหน่งแทนเพื่อให้ฟอร์มสามารถกรอกต่อได้
result = await this.mapKnowledgeSkillRepository.findOne({
where: {
positionLevelName: person.positionLevelName,
active: 1,
},
})
}
if (!result) {
// ถ้าตำแหน่งไม่ตรงหาจากระดับตำแหน่งแทนเพื่อให้ฟอร์มสามารถกรอกต่อได้
result = await this.mapKnowledgeSkillRepository.findOne({
where: {
positionLevelName: person.positionLevelName,
active: 1,
},
});
}
if (!result) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลความรู้ที่ตรงกับตำแหน่ง")
}
if (!result) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลความรู้ที่ตรงกับตำแหน่ง");
}
const knowledges = await this.knowledgeRepository.find({
where: { type: TypeKnowledge.PERFORMANCE, active: 1 },
})
const knowledges = await this.knowledgeRepository.find({
where: { type: TypeKnowledge.PERFORMANCE, active: 1 },
});
const knowledge = knowledges.map(knowledge => ({
id: knowledge.id,
title: knowledge.title,
description:
result.knowlage_performance_level == 1
? knowledge.level1
: result.knowlage_performance_level == 2
? knowledge.level2
: result.knowlage_performance_level == 3
? knowledge.level3
: result.knowlage_performance_level == 4
? knowledge.level4
: knowledge.level5,
level: result.knowlage_performance_level,
}))
const knowledge = knowledges.map((knowledge) => ({
id: knowledge.id,
title: knowledge.title,
description:
result.knowlage_performance_level == 1
? knowledge.level1
: result.knowlage_performance_level == 2
? knowledge.level2
: result.knowlage_performance_level == 3
? knowledge.level3
: result.knowlage_performance_level == 4
? knowledge.level4
: knowledge.level5,
level: result.knowlage_performance_level,
}));
return new HttpSuccess(knowledge);
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
}
return new HttpSuccess(knowledge)
}
/**
* API
*
* @summary options
*
*/
@Get("skill")
async GetSkill(@Query() personal_id: string) {
try {
const person = await this.personalRepository.findOne({
where: { personal_id },
});
/**
* API
*
* @summary options
*
*/
@Get("skill")
async GetSkill(@Query() personal_id: string) {
const person = await this.personalRepository.findOne({
where: { personal_id },
})
if (!person) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
}
if (!person) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล")
}
let result = await this.mapKnowledgeSkillRepository.findOne({
select: [
"skill_computer_level",
"skill_english_level",
"skill_information_level",
"skill_resourse_level",
],
where: {
positionName: person.positionName,
positionLevelName: person.positionLevelName,
active: 1,
},
});
let result = await this.mapKnowledgeSkillRepository.findOne({
select: ["skill_computer_level", "skill_english_level", "skill_information_level", "skill_resourse_level"],
where: {
positionName: person.positionName,
positionLevelName: person.positionLevelName,
active: 1,
},
})
if (!result) {
// ถ้าตำแหน่งไม่ตรงหาจากระดับตำแหน่งแทนเพื่อให้ฟอร์มสามารถกรอกต่อได้
result = await this.mapKnowledgeSkillRepository.findOne({
select: [
"skill_computer_level",
"skill_english_level",
"skill_information_level",
"skill_resourse_level",
],
where: {
positionLevelName: person.positionLevelName,
active: 1,
},
});
}
if (!result) {
// ถ้าตำแหน่งไม่ตรงหาจากระดับตำแหน่งแทนเพื่อให้ฟอร์มสามารถกรอกต่อได้
result = await this.mapKnowledgeSkillRepository.findOne({
select: ["skill_computer_level", "skill_english_level", "skill_information_level", "skill_resourse_level"],
where: {
positionLevelName: person.positionLevelName,
active: 1,
},
})
}
if (!result) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทักษะที่ตรงกับตำแหน่ง");
}
if (!result) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทักษะที่ตรงกับตำแหน่ง")
}
const computerData = await this.skillRepository.findOne({
where: { type: TypeSkill.COMPUTER, active: 1 },
});
const computerData = await this.skillRepository.findOne({
where: { type: TypeSkill.COMPUTER, active: 1 },
})
if (!computerData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทักษะคอมพิวเตอร์");
}
const computer = await {
id: computerData.id,
title: computerData.title,
level_description:
result.skill_computer_level == 1
? computerData.level1
: result.skill_computer_level == 2
? computerData.level2
: result.skill_computer_level == 3
? computerData.level3
: result.skill_computer_level == 4
? computerData.level4
: computerData.level5,
level: result.skill_computer_level,
};
if (!computerData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทักษะคอมพิวเตอร์")
}
const computer = await {
id: computerData.id,
title: computerData.title,
level_description:
result.skill_computer_level == 1
? computerData.level1
: result.skill_computer_level == 2
? computerData.level2
: result.skill_computer_level == 3
? computerData.level3
: result.skill_computer_level == 4
? computerData.level4
: computerData.level5,
level: result.skill_computer_level,
}
const englishData = await this.skillRepository.findOne({
where: { type: TypeSkill.ENG, active: 1 },
});
const englishData = await this.skillRepository.findOne({
where: { type: TypeSkill.ENG, active: 1 },
})
if (!englishData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทักษะภาษาอังกฤษ");
}
if (!englishData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทักษะภาษาอังกฤษ")
}
const english = await {
id: englishData.id,
title: englishData.title,
level_description:
result.skill_english_level == 1
? englishData.level1
: result.skill_english_level == 2
? englishData.level2
: result.skill_english_level == 3
? englishData.level3
: result.skill_english_level == 4
? englishData.level4
: englishData.level5,
level: result.skill_english_level,
};
const english = await {
id: englishData.id,
title: englishData.title,
level_description:
result.skill_english_level == 1
? englishData.level1
: result.skill_english_level == 2
? englishData.level2
: result.skill_english_level == 3
? englishData.level3
: result.skill_english_level == 4
? englishData.level4
: englishData.level5,
level: result.skill_english_level,
}
const informationData = await this.skillRepository.findOne({
where: { type: TypeSkill.INFORMATION, active: 1 },
});
const informationData = await this.skillRepository.findOne({
where: { type: TypeSkill.INFORMATION, active: 1 },
})
if (!informationData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
}
if (!informationData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล")
}
const information = await {
id: informationData.id,
title: informationData.title,
level_description:
result.skill_information_level == 1
? informationData.level1
: result.skill_information_level == 2
? informationData.level2
: result.skill_information_level == 3
? informationData.level3
: result.skill_information_level == 4
? informationData.level4
: informationData.level5,
level: result.skill_information_level,
};
const information = await {
id: informationData.id,
title: informationData.title,
level_description:
result.skill_information_level == 1
? informationData.level1
: result.skill_information_level == 2
? informationData.level2
: result.skill_information_level == 3
? informationData.level3
: result.skill_information_level == 4
? informationData.level4
: informationData.level5,
level: result.skill_information_level,
}
const resourseData = await this.skillRepository.findOne({
where: { type: TypeSkill.RESOURSE, active: 1 },
});
if (!resourseData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
}
const resourseData = await this.skillRepository.findOne({
where: { type: TypeSkill.RESOURSE, active: 1 },
})
if (!resourseData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล")
}
const resourse = await {
id: resourseData.id,
title: resourseData.title,
level_description:
result.skill_resourse_level == 1
? resourseData.level1
: result.skill_resourse_level == 2
? resourseData.level2
: result.skill_resourse_level == 3
? resourseData.level3
: result.skill_resourse_level == 4
? resourseData.level4
: resourseData.level5,
level: result.skill_resourse_level,
};
const resourse = await {
id: resourseData.id,
title: resourseData.title,
level_description:
result.skill_resourse_level == 1
? resourseData.level1
: result.skill_resourse_level == 2
? resourseData.level2
: result.skill_resourse_level == 3
? resourseData.level3
: result.skill_resourse_level == 4
? resourseData.level4
: resourseData.level5,
level: result.skill_resourse_level,
}
return new HttpSuccess({
computer,
english,
information,
resourse,
});
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
}
return new HttpSuccess({
computer,
english,
information,
resourse,
})
}
/**
* API list
*
* @summary options
*
*/
@Get("law")
async GetLaw(@Query() personal_id: string) {
try {
const results = await this.lawRepository.find({
select: ["id", "parent_id", "description", "status_select"],
where: {
active: 1,
},
});
/**
* API list
*
* @summary options
*
*/
@Get("law")
async GetLaw(@Query() personal_id: string) {
const results = await this.lawRepository.find({
select: ["id", "parent_id", "description", "status_select"],
where: {
active: 1,
},
})
if (!results) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
}
if (!results) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล")
}
const result = await results.map((v) => ({
...v,
checked: 0,
}));
const result = await results.map(v => ({
...v,
checked: 0,
}))
return new HttpSuccess(result);
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
}
return new HttpSuccess(result)
}
/**
* API
*
* @summary
*
*/
@Get("new-assign")
async NewAssign(@Query() personal_id: string, @Request() request: RequestWithUser) {
try {
let _workflow = await new permission().Workflow(request, personal_id, "SYS_PROBATION");
if (_workflow == false) await new permission().PermissionGet(request, "SYS_PROBATION");
/**
* API
*
* @summary
*
*/
@Get("new-assign")
async NewAssign(@Query() personal_id: string, @Request() request: RequestWithUser) {
let _workflow = await new permission().Workflow(request, personal_id, "SYS_PROBATION")
if (_workflow == false) await new permission().PermissionGet(request, "SYS_PROBATION")
const person = await this.personalRepository.findOne({
select: [
"personal_id",
"prefixName",
"firstName",
"lastName",
"posNo",
"positionName",
"positionLevelName",
"positionLineName",
"isProbation",
"orgRootName",
"organization",
"createdAt",
"updatedAt",
],
where: { personal_id },
});
const person = await this.personalRepository.findOne({
select: [
"personal_id",
"prefixName",
"firstName",
"lastName",
"posNo",
"positionName",
"positionLevelName",
"positionLineName",
"isProbation",
"orgRootName",
"organization",
"createdAt",
"updatedAt",
],
where: { personal_id },
})
if (!person) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
}
if (!person) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล")
}
const assign = await this.assignRepository.count({
where: {
personal_id,
},
});
const assign = await this.assignRepository.count({
where: {
personal_id,
},
})
const responsePerson = {
id: person.personal_id,
...person,
};
const responsePerson = {
id: person.personal_id,
...person,
}
return new HttpSuccess({
person: responsePerson,
assign_no: assign + 1,
assign_month: 6,
});
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
}
/**
* API (USER)
*
* @summary (USER)
*
*/
@Get("new-assign-user")
async NewAssignUser(@Query() personal_id: string, @Request() request: RequestWithUser) {
try {
const person = await this.personalRepository.findOne({
select: [
"personal_id",
"prefixName",
"firstName",
"lastName",
"posNo",
"positionName",
"positionLevelName",
"positionLineName",
"isProbation",
"orgRootName",
"organization",
"createdAt",
"updatedAt",
],
where: { personal_id },
});
return new HttpSuccess({
person: responsePerson,
assign_no: assign + 1,
assign_month: 6,
})
}
/**
* API (USER)
*
* @summary (USER)
*
*/
@Get("new-assign-user")
async NewAssignUser(@Query() personal_id: string, @Request() request: RequestWithUser) {
const person = await this.personalRepository.findOne({
select: [
"personal_id",
"prefixName",
"firstName",
"lastName",
"posNo",
"positionName",
"positionLevelName",
"positionLineName",
"isProbation",
"orgRootName",
"organization",
"createdAt",
"updatedAt",
],
where: { personal_id },
})
if (!person) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
}
if (!person) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล")
}
const assign = await this.assignRepository.count({
where: {
personal_id,
},
});
const assign = await this.assignRepository.count({
where: {
personal_id,
},
})
const responsePerson = {
id: person.personal_id,
...person,
};
const responsePerson = {
id: person.personal_id,
...person,
}
return new HttpSuccess({
person: responsePerson,
assign_no: assign + 1,
assign_month: 6,
})
}
return new HttpSuccess({
person: responsePerson,
assign_no: assign + 1,
assign_month: 6,
});
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
}
}

View file

@ -22,24 +22,19 @@ import HttpError from "../interfaces/http-error";
import { Assign } from "../entities/Assign";
import { Personal } from "../entities/Personal";
import CallAPI from "../interfaces/call-api";
import {
CreateEvaluateChairman,
EvaluateChairman,
} from "../entities/EvaluateChairman";
import { CreateEvaluateChairman, EvaluateChairman } from "../entities/EvaluateChairman";
import permission from "../interfaces/permission";
@Route("api/v1/probation/evaluate-chairman")
@Tags("แบบประเมินผล (คณะกรรมการ)")
@Security("bearerAuth")
@Response(
HttpStatusCode.INTERNAL_SERVER_ERROR,
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง"
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง",
)
export class EvaluateChairmanController 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);
/**
@ -49,149 +44,132 @@ export class EvaluateChairmanController 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) {
try {
let _workflow = await new permission().Workflow(request, assign_id, "SYS_PROBATION");
if (_workflow == false) await new permission().PermissionGet(request, "SYS_PROBATION");
const director = await this.assignDirectorRepository.findOne({
select: ["personal_id"],
where: {
assign_id,
role: "chairman",
},
});
if (!director) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
}
const director_id = director.personal_id;
const assign = await this.assignRepository.findOne({
relations: ["profile"],
where: { id: assign_id },
});
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
}
const profile = await (assign.profile
? {
...assign.profile,
id: assign.profile.personal_id,
name:
assign.profile.prefixName +
assign.profile.firstName +
" " +
assign.profile.lastName,
Oc: assign.profile.organization,
}
: null);
const evaluate_amount = await this.evaluateChairmanRepository.count({
where: {
assign_id,
director_id,
},
});
const evaluate_no = await (evaluate_amount + 1);
const start_date =
evaluate_amount == 0
? assign.date_start
: findEndDate(evaluate_amount * 3, assign.date_start);
const directorData = await this.assignDirectorRepository.find({
where: { assign_id },
order: { ordering: "ASC" },
});
if (!directorData) {
throw new HttpError(
HttpStatusCode.NOT_FOUND,
"ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน"
);
}
let mentors = [];
const mentorList = await directorData.filter((x) => x.role == "mentor");
if (mentorList.length > 0) {
for (let index = 0; index < mentorList.length; index++) {
const e = await mentorList[index];
mentors.push({
personal_id: e.personal_id,
dated: e.dated,
name: e.fullname,
label:
e.fullname +
" " +
(e.position ? `(${e.position}${e.posLevel})` : ""),
position: e.position,
posType: e.posType,
posLevel: e.posLevel,
});
const director = await this.assignDirectorRepository.findOne({
select: ["personal_id"],
where: {
assign_id,
role: "chairman",
},
});
if (!director) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
}
const director_id = director.personal_id;
const assign = await this.assignRepository.findOne({
relations: ["profile"],
where: { id: assign_id },
});
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
}
const profile = await (assign.profile
? {
...assign.profile,
id: assign.profile.personal_id,
name:
assign.profile.prefixName + assign.profile.firstName + " " + assign.profile.lastName,
Oc: assign.profile.organization,
}
: null);
const evaluate_amount = await this.evaluateChairmanRepository.count({
where: {
assign_id,
director_id,
},
});
const evaluate_no = await (evaluate_amount + 1);
const start_date =
evaluate_amount == 0
? assign.date_start
: findEndDate(evaluate_amount * 3, assign.date_start);
const directorData = await this.assignDirectorRepository.find({
where: { assign_id },
order: { ordering: "ASC" },
});
if (!directorData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน");
}
let mentors = [];
const mentorList = await directorData.filter((x) => x.role == "mentor");
if (mentorList.length > 0) {
for (let index = 0; index < mentorList.length; index++) {
const e = await mentorList[index];
mentors.push({
personal_id: e.personal_id,
dated: e.dated,
name: e.fullname,
label: e.fullname + " " + (e.position ? `(${e.position}${e.posLevel})` : ""),
position: e.position,
posType: e.posType,
posLevel: e.posLevel,
});
}
}
const commanderData = await (directorData.find((x) => x.role == "commander") ?? null);
const commander =
commanderData != null
? {
personal_id: commanderData.personal_id,
dated: commanderData.dated,
name: commanderData.fullname,
label:
commanderData.fullname +
" " +
(commanderData.position
? `(${commanderData.position}${commanderData.posLevel})`
: ""),
position: commanderData.position,
posType: commanderData.posType,
posLevel: commanderData.posLevel,
}
: null;
const chairmanData = await (directorData.find((x) => x.role == "chairman") ?? null);
const chairman =
chairmanData != null
? {
personal_id: chairmanData.personal_id,
dated: chairmanData.dated,
name: chairmanData.fullname,
label:
chairmanData.fullname +
" " +
(chairmanData.position ? `(${chairmanData.position}${chairmanData.posLevel})` : ""),
position: chairmanData.position,
posType: chairmanData.posType,
posLevel: chairmanData.posLevel,
}
: null;
return new HttpSuccess({
person: profile ? profile : null,
assign,
evaluate_no: evaluate_no,
start_date: start_date,
end_date: findEndDate(3, start_date),
commander,
mentors,
chairman,
});
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
const commanderData = await (directorData.find(
(x) => x.role == "commander"
) ?? null);
const commander =
commanderData != null
? {
personal_id: commanderData.personal_id,
dated: commanderData.dated,
name: commanderData.fullname,
label:
commanderData.fullname +
" " +
(commanderData.position
? `(${commanderData.position}${commanderData.posLevel})`
: ""),
position: commanderData.position,
posType: commanderData.posType,
posLevel: commanderData.posLevel,
}
: null;
const chairmanData = await (directorData.find(
(x) => x.role == "chairman"
) ?? null);
const chairman =
chairmanData != null
? {
personal_id: chairmanData.personal_id,
dated: chairmanData.dated,
name: chairmanData.fullname,
label:
chairmanData.fullname +
" " +
(chairmanData.position
? `(${chairmanData.position}${chairmanData.posLevel})`
: ""),
position: chairmanData.position,
posType: chairmanData.posType,
posLevel: chairmanData.posLevel,
}
: null;
return new HttpSuccess({
person: profile ? profile : null,
assign,
evaluate_no: evaluate_no,
start_date: start_date,
end_date: findEndDate(3, start_date),
commander,
mentors,
chairman,
});
}
/**
@ -204,159 +182,153 @@ export class EvaluateChairmanController 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");
// ต้องปรับเป็น id ของคนที่ access เข้ามา
const director = await this.assignDirectorRepository.findOne({
select: ["personal_id"],
where: {
assign_id,
role: "chairman",
},
});
if (!director) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
}
const director_id = director.personal_id;
let evaluate: any = null;
if (evaluate_no) {
evaluate = await this.evaluateChairmanRepository.findOne({
try {
await new permission().PermissionGet(request, "SYS_PROBATION");
// ต้องปรับเป็น id ของคนที่ access เข้ามา
const director = await this.assignDirectorRepository.findOne({
select: ["personal_id"],
where: {
director_id,
assign_id,
no: evaluate_no,
role: "chairman",
},
});
} else {
evaluate = await this.evaluateChairmanRepository.find({
where: {
director_id,
assign_id,
},
});
if (evaluate)
evaluate = await evaluate.map((element: EvaluateChairman) => ({
...element,
no: Number(element.no),
}));
}
if (!evaluate) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบประเมิน");
}
const assign = await this.assignRepository.findOne({
where: { id: assign_id },
});
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
}
const experimenteeData = await this.personalRepository.find({
select: [
"personal_id",
"prefixName",
"firstName",
"lastName",
"positionName",
"positionLevelName",
"organization",
],
where: { personal_id: assign.personal_id },
});
const experimentee = await experimenteeData.map((element) => ({
...element,
name: element.prefixName + element.firstName + " " + element.lastName,
Oc: element.organization,
}));
const directorData = await this.assignDirectorRepository.find({
where: { assign_id },
order: { ordering: "ASC" },
});
if (!directorData) {
throw new HttpError(
HttpStatusCode.NOT_FOUND,
"ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน"
);
}
let mentors = [];
const mentorList = await directorData.filter((x) => x.role == "mentor");
if (mentorList.length > 0) {
for (let index = 0; index < mentorList.length; index++) {
const e = await mentorList[index];
mentors.push({
personal_id: e.personal_id,
dated: e.dated,
name: e.fullname,
label:
e.fullname +
" " +
(e.position ? `(${e.position}${e.posLevel})` : ""),
position: e.position,
posType: e.posType,
posLevel: e.posLevel,
});
if (!director) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
}
const director_id = director.personal_id;
let evaluate: any = null;
if (evaluate_no) {
evaluate = await this.evaluateChairmanRepository.findOne({
where: {
director_id,
assign_id,
no: evaluate_no,
},
});
} else {
evaluate = await this.evaluateChairmanRepository.find({
where: {
director_id,
assign_id,
},
});
if (evaluate)
evaluate = await evaluate.map((element: EvaluateChairman) => ({
...element,
no: Number(element.no),
}));
}
if (!evaluate) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบประเมิน");
}
const assign = await this.assignRepository.findOne({
where: { id: assign_id },
});
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
}
const experimenteeData = await this.personalRepository.find({
select: [
"personal_id",
"prefixName",
"firstName",
"lastName",
"positionName",
"positionLevelName",
"organization",
],
where: { personal_id: assign.personal_id },
});
const experimentee = await experimenteeData.map((element) => ({
...element,
name: element.prefixName + element.firstName + " " + element.lastName,
Oc: element.organization,
}));
const directorData = await this.assignDirectorRepository.find({
where: { assign_id },
order: { ordering: "ASC" },
});
if (!directorData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน");
}
let mentors = [];
const mentorList = await directorData.filter((x) => x.role == "mentor");
if (mentorList.length > 0) {
for (let index = 0; index < mentorList.length; index++) {
const e = await mentorList[index];
mentors.push({
personal_id: e.personal_id,
dated: e.dated,
name: e.fullname,
label: e.fullname + " " + (e.position ? `(${e.position}${e.posLevel})` : ""),
position: e.position,
posType: e.posType,
posLevel: e.posLevel,
});
}
}
const commanderData = await (directorData.find((x) => x.role == "commander") ?? null);
const commander =
commanderData != null
? {
personal_id: commanderData.personal_id,
dated: commanderData.dated,
name: commanderData.fullname,
label:
commanderData.fullname +
" " +
(commanderData.position
? `(${commanderData.position}${commanderData.posLevel})`
: ""),
position: commanderData.position,
posType: commanderData.posType,
posLevel: commanderData.posLevel,
}
: null;
const chairmanData = await (directorData.find((x) => x.role == "chairman") ?? null);
const chairman =
chairmanData != null
? {
personal_id: chairmanData.personal_id,
dated: chairmanData.dated,
name: chairmanData.fullname,
label:
chairmanData.fullname +
" " +
(chairmanData.position ? `(${chairmanData.position}${chairmanData.posLevel})` : ""),
position: chairmanData.position,
posType: chairmanData.posType,
posLevel: chairmanData.posLevel,
}
: null;
return new HttpSuccess({
experimentee: experimentee,
mentors: mentors,
commander: commander,
chairman: chairman,
assign,
evaluate,
});
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
const commanderData = await (directorData.find(
(x) => x.role == "commander"
) ?? null);
const commander =
commanderData != null
? {
personal_id: commanderData.personal_id,
dated: commanderData.dated,
name: commanderData.fullname,
label:
commanderData.fullname +
" " +
(commanderData.position
? `(${commanderData.position}${commanderData.posLevel})`
: ""),
position: commanderData.position,
posType: commanderData.posType,
posLevel: commanderData.posLevel,
}
: null;
const chairmanData = await (directorData.find(
(x) => x.role == "chairman"
) ?? null);
const chairman =
chairmanData != null
? {
personal_id: chairmanData.personal_id,
dated: chairmanData.dated,
name: chairmanData.fullname,
label:
chairmanData.fullname +
" " +
(chairmanData.position
? `(${chairmanData.position}${chairmanData.posLevel})`
: ""),
position: chairmanData.position,
posType: chairmanData.posType,
posLevel: chairmanData.posLevel,
}
: null;
return new HttpSuccess({
experimentee: experimentee,
mentors: mentors,
commander: commander,
chairman: chairman,
assign,
evaluate,
});
}
/**
@ -369,83 +341,87 @@ export class EvaluateChairmanController extends Controller {
async PostData(
@Query() assign_id: string,
@Body() requestBody: CreateEvaluateChairman,
@Request() request: RequestWithUser
@Request() request: RequestWithUser,
) {
await new permission().PermissionUpdate(request, "SYS_PROBATION");
try {
await new permission().PermissionUpdate(request, "SYS_PROBATION");
const director = await this.assignDirectorRepository.findOne({
select: ["personal_id"],
where: {
const director = await this.assignDirectorRepository.findOne({
select: ["personal_id"],
where: {
assign_id,
role: "chairman",
},
});
if (!director) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
}
const director_id = director.personal_id;
const assign = await this.assignRepository.findOne({
relations: ["profile"],
where: { id: assign_id },
});
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
}
const postData: any = await {
assign_id,
role: "chairman",
},
});
if (!director) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
}
...requestBody,
director_id,
no: requestBody.evaluate_no,
date_start: requestBody.start_date,
personal_id: assign.personal_id,
const director_id = director.personal_id;
const assign = await this.assignRepository.findOne({
relations: ["profile"],
where: { id: assign_id },
});
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
}
const postData: any = await {
assign_id,
...requestBody,
director_id,
no: requestBody.evaluate_no,
date_start: requestBody.start_date,
personal_id: assign.personal_id,
achievement_other_desc: requestBody.achievement_other
? requestBody.achievement_other.text
: "",
achievement_other_level: requestBody.achievement_other
? Number(requestBody.achievement_other.level)
: 0,
behavior_other_desc: requestBody.behavior_orther.text,
behavior_other_level:
requestBody.behavior_orther.text != ""
? Number(requestBody.behavior_orther.level)
achievement_other_desc: requestBody.achievement_other
? requestBody.achievement_other.text
: "",
achievement_other_level: requestBody.achievement_other
? Number(requestBody.achievement_other.level)
: 0,
behavior_other_desc: requestBody.behavior_orther.text,
behavior_other_level:
requestBody.behavior_orther.text != "" ? Number(requestBody.behavior_orther.level) : 0,
createdUserId: request.user.sub,
createdFullName: request.user.name,
updateUserId: request.user.sub,
updateFullName: request.user.name,
};
createdUserId: request.user.sub,
createdFullName: request.user.name,
updateUserId: request.user.sub,
updateFullName: request.user.name,
};
await this.evaluateChairmanRepository.save(postData, {
data: request,
});
setLogDataDiff(request, { before: null, after: postData });
await this.evaluateChairmanRepository.save(postData, {
data: request,
});
setLogDataDiff(request, { before: null, after: postData });
if (Number(requestBody.evaluate_no) < 2) {
// #noted cronjob
// แจ้งประธานเข้ามาบันทึกผลทุก 3 เดือน 2 ครั้ง
var dateSend = await findEndDate(3, requestBody.start_date);
const nextNo = await (Number(requestBody.evaluate_no) + 1);
await new CallAPI()
.PostData(request, "/placement/noti", {
subject: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการครั้งที่ ${nextNo} ${assign.profile.prefixName}${assign.profile.firstName} ${assign.profile.lastName}`,
body: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการ (สำหรับคณะกรรมการ) ครั้งที่ ${nextNo} ${assign.profile.prefixName}${assign.profile.firstName} ${assign.profile.lastName}`,
receiverUserId: director_id,
payload: "",
isSendMail: true,
isSendInbox: true,
receiveDate: dateSend,
})
.catch((error) => {
console.error("Error calling API:", error);
});
if (Number(requestBody.evaluate_no) < 2) {
// #noted cronjob
// แจ้งประธานเข้ามาบันทึกผลทุก 3 เดือน 2 ครั้ง
var dateSend = await findEndDate(3, requestBody.start_date);
const nextNo = await (Number(requestBody.evaluate_no) + 1);
await new CallAPI()
.PostData(request, "/placement/noti", {
subject: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการครั้งที่ ${nextNo} ${assign.profile.prefixName}${assign.profile.firstName} ${assign.profile.lastName}`,
body: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการ (สำหรับคณะกรรมการ) ครั้งที่ ${nextNo} ${assign.profile.prefixName}${assign.profile.firstName} ${assign.profile.lastName}`,
receiverUserId: director_id,
payload: "",
isSendMail: true,
isSendInbox: true,
receiveDate: dateSend,
})
.catch((error) => {
console.error("Error calling API:", error);
});
}
return new HttpSuccess();
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
return new HttpSuccess();
}
/**
@ -459,85 +435,80 @@ export class EvaluateChairmanController extends Controller {
// @Query() assign_id: string,
@Query() evaluate_id: string,
@Body() requestBody: CreateEvaluateChairman,
@Request() request: RequestWithUser
@Request() request: RequestWithUser,
) {
await new permission().PermissionUpdate(request, "SYS_PROBATION");
try {
await new permission().PermissionUpdate(request, "SYS_PROBATION");
let evaluate = await this.evaluateChairmanRepository.findOne({
where: { id: evaluate_id },
});
let evaluate = await this.evaluateChairmanRepository.findOne({
where: { id: evaluate_id },
});
const before = evaluate;
const before = evaluate;
if (!evaluate) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมิน");
if (!evaluate) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมิน");
}
evaluate.chairman_dated = requestBody.chairman_dated;
evaluate.director1_dated = requestBody.director1_dated;
evaluate.director2_dated = requestBody.director2_dated;
evaluate.knowledge_level = requestBody.knowledge_level;
evaluate.apply_level = requestBody.apply_level;
evaluate.success_level = requestBody.success_level;
evaluate.achievement_other_desc = requestBody.achievement_other
? requestBody.achievement_other.text
: "";
evaluate.achievement_other_level =
requestBody.achievement_other.text != "" ? Number(requestBody.achievement_other.level) : 0;
evaluate.conduct1_level = requestBody.conduct1_level;
evaluate.conduct2_level = requestBody.conduct2_level;
evaluate.conduct3_level = requestBody.conduct3_level;
evaluate.conduct4_level = requestBody.conduct4_level;
evaluate.moral1_level = requestBody.moral1_level;
evaluate.moral2_level = requestBody.moral2_level;
evaluate.moral3_level = requestBody.moral3_level;
evaluate.discipline1_level = requestBody.discipline1_level;
evaluate.discipline2_level = requestBody.discipline2_level;
evaluate.discipline3_level = requestBody.discipline3_level;
evaluate.discipline4_level = requestBody.discipline4_level;
evaluate.discipline5_level = requestBody.discipline5_level;
evaluate.behavior_other_desc = requestBody.behavior_orther.text;
evaluate.behavior_other_level =
requestBody.behavior_orther.text != "" ? Number(requestBody.behavior_orther.level) : 0;
evaluate.develop_orientation_score = requestBody.develop_orientation_score;
evaluate.develop_self_learning_score = requestBody.develop_self_learning_score;
evaluate.develop_training_seminar_score = requestBody.develop_training_seminar_score;
evaluate.develop_other_training_score = requestBody.develop_other_training_score;
evaluate.develop_orientation_percent = requestBody.develop_orientation_percent;
evaluate.develop_self_learning_percent = requestBody.develop_self_learning_percent;
evaluate.develop_training_seminar_percent = requestBody.develop_training_seminar_percent;
evaluate.develop_other_training_percent = requestBody.develop_other_training_percent;
evaluate.develop_result = requestBody.develop_result;
evaluate.achievement_score = requestBody.achievement_score;
evaluate.achievement_score_total = requestBody.achievement_score_total;
evaluate.achievement_percent = requestBody.achievement_percent;
evaluate.achievement_result = requestBody.achievement_result;
evaluate.behavior_score = requestBody.behavior_score;
evaluate.behavior_score_total = requestBody.behavior_score_total;
evaluate.behavior_percent = requestBody.behavior_percent;
evaluate.behavior_result = requestBody.behavior_result;
evaluate.sum_score = requestBody.sum_score;
evaluate.sum_percent = requestBody.sum_percent;
evaluate.evaluate_result = requestBody.evaluate_result;
evaluate.updateUserId = request.user.sub;
evaluate.updateFullName = request.user.name;
await this.evaluateChairmanRepository.save(evaluate, { data: request });
setLogDataDiff(request, { before, after: evaluate });
return new HttpSuccess();
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
evaluate.chairman_dated = requestBody.chairman_dated;
evaluate.director1_dated = requestBody.director1_dated;
evaluate.director2_dated = requestBody.director2_dated;
evaluate.knowledge_level = requestBody.knowledge_level;
evaluate.apply_level = requestBody.apply_level;
evaluate.success_level = requestBody.success_level;
evaluate.achievement_other_desc = requestBody.achievement_other
? requestBody.achievement_other.text
: "";
evaluate.achievement_other_level =
requestBody.achievement_other.text != ""
? Number(requestBody.achievement_other.level)
: 0;
evaluate.conduct1_level = requestBody.conduct1_level;
evaluate.conduct2_level = requestBody.conduct2_level;
evaluate.conduct3_level = requestBody.conduct3_level;
evaluate.conduct4_level = requestBody.conduct4_level;
evaluate.moral1_level = requestBody.moral1_level;
evaluate.moral2_level = requestBody.moral2_level;
evaluate.moral3_level = requestBody.moral3_level;
evaluate.discipline1_level = requestBody.discipline1_level;
evaluate.discipline2_level = requestBody.discipline2_level;
evaluate.discipline3_level = requestBody.discipline3_level;
evaluate.discipline4_level = requestBody.discipline4_level;
evaluate.discipline5_level = requestBody.discipline5_level;
evaluate.behavior_other_desc = requestBody.behavior_orther.text;
evaluate.behavior_other_level =
requestBody.behavior_orther.text != ""
? Number(requestBody.behavior_orther.level)
: 0;
evaluate.develop_orientation_score = requestBody.develop_orientation_score;
evaluate.develop_self_learning_score =
requestBody.develop_self_learning_score;
evaluate.develop_training_seminar_score =
requestBody.develop_training_seminar_score;
evaluate.develop_other_training_score =
requestBody.develop_other_training_score;
evaluate.develop_orientation_percent =
requestBody.develop_orientation_percent;
evaluate.develop_self_learning_percent =
requestBody.develop_self_learning_percent;
evaluate.develop_training_seminar_percent =
requestBody.develop_training_seminar_percent;
evaluate.develop_other_training_percent =
requestBody.develop_other_training_percent;
evaluate.develop_result = requestBody.develop_result;
evaluate.achievement_score = requestBody.achievement_score;
evaluate.achievement_score_total = requestBody.achievement_score_total;
evaluate.achievement_percent = requestBody.achievement_percent;
evaluate.achievement_result = requestBody.achievement_result;
evaluate.behavior_score = requestBody.behavior_score;
evaluate.behavior_score_total = requestBody.behavior_score_total;
evaluate.behavior_percent = requestBody.behavior_percent;
evaluate.behavior_result = requestBody.behavior_result;
evaluate.sum_score = requestBody.sum_score;
evaluate.sum_percent = requestBody.sum_percent;
evaluate.evaluate_result = requestBody.evaluate_result;
evaluate.updateUserId = request.user.sub;
evaluate.updateFullName = request.user.name;
await this.evaluateChairmanRepository.save(evaluate, { data: request });
setLogDataDiff(request, { before, after: evaluate });
return new HttpSuccess();
}
}

View file

@ -1,349 +1,418 @@
import { Controller, Route, Security, Tags, Request, SuccessResponse, Response, Get, Post, Body, Query, Put } from "tsoa"
import HttpSuccess from "../interfaces/http-success"
import HttpStatusCode from "../interfaces/http-status"
import { RequestWithUser } from "../middlewares/user"
import { findEndDate, setLogDataDiff } from "../interfaces/utils"
import { AppDataSource } from "../database/data-source"
import { AssignDirector } from "../entities/AssignDirector"
import HttpError from "../interfaces/http-error"
import { Assign } from "../entities/Assign"
import { CreateEvaluateCommander, EvaluateCommander } from "../entities/EvaluateCommander"
import { Personal } from "../entities/Personal"
import CallAPI from "../interfaces/call-api"
import permission from "../interfaces/permission"
import {
Controller,
Route,
Security,
Tags,
Request,
SuccessResponse,
Response,
Get,
Post,
Body,
Query,
Put,
} from "tsoa";
import HttpSuccess from "../interfaces/http-success";
import HttpStatusCode from "../interfaces/http-status";
import { RequestWithUser } from "../middlewares/user";
import { findEndDate, setLogDataDiff } from "../interfaces/utils";
import { AppDataSource } from "../database/data-source";
import { AssignDirector } from "../entities/AssignDirector";
import HttpError from "../interfaces/http-error";
import { Assign } from "../entities/Assign";
import { CreateEvaluateCommander, EvaluateCommander } from "../entities/EvaluateCommander";
import { Personal } from "../entities/Personal";
import CallAPI from "../interfaces/call-api";
import permission from "../interfaces/permission";
@Route("api/v1/probation/evaluate")
@Tags("แบบประเมินผล (ผู้บังคับบัญชา)")
@Security("bearerAuth")
@Response(HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง")
@Response(
HttpStatusCode.INTERNAL_SERVER_ERROR,
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง",
)
export class EvaluateController extends Controller {
private assignDirectorRepository = AppDataSource.getRepository(AssignDirector)
private assignRepository = AppDataSource.getRepository(Assign)
private evaluateCommanderRepository = AppDataSource.getRepository(EvaluateCommander)
private personalRepository = AppDataSource.getRepository(Personal)
private assignDirectorRepository = AppDataSource.getRepository(AssignDirector);
private assignRepository = AppDataSource.getRepository(Assign);
private evaluateCommanderRepository = AppDataSource.getRepository(EvaluateCommander);
private personalRepository = AppDataSource.getRepository(Personal);
/**
* API ()
*
* @summary ()
*
*/
@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")
/**
* API ()
*
* @summary ()
*
*/
@Get("create")
async CreateEvaluate(@Query() assign_id: string, @Request() request: RequestWithUser) {
try {
let _workflow = await new permission().Workflow(request, assign_id, "SYS_PROBATION");
if (_workflow == false) await new permission().PermissionGet(request, "SYS_PROBATION");
const director = await this.assignDirectorRepository.findOne({
select: ["personal_id"],
where: {
assign_id,
role: "commander",
},
})
if (!director) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล")
}
const director_id = director.personal_id
const director = await this.assignDirectorRepository.findOne({
select: ["personal_id"],
where: {
assign_id,
role: "commander",
},
});
if (!director) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
}
const director_id = director.personal_id;
const assign = await this.assignRepository.findOne({
relations: ["profile"],
where: { id: assign_id },
})
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน")
}
const assign = await this.assignRepository.findOne({
relations: ["profile"],
where: { id: assign_id },
});
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
}
const profile = await (assign.profile
? {
...assign.profile,
id: assign.profile.personal_id,
name: assign.profile.prefixName + assign.profile.firstName + " " + assign.profile.lastName,
Oc: assign.profile.organization,
}
: null)
const profile = await (assign.profile
? {
...assign.profile,
id: assign.profile.personal_id,
name:
assign.profile.prefixName + assign.profile.firstName + " " + assign.profile.lastName,
Oc: assign.profile.organization,
}
: null);
const evaluate_amount = await this.evaluateCommanderRepository.count({
where: {
assign_id,
director_id,
},
})
const evaluate_no = await (evaluate_amount + 1)
const start_date = evaluate_amount == 0 ? assign.date_start : findEndDate(evaluate_amount * 3, assign.date_start)
const evaluate_amount = await this.evaluateCommanderRepository.count({
where: {
assign_id,
director_id,
},
});
const evaluate_no = await (evaluate_amount + 1);
const start_date =
evaluate_amount == 0
? assign.date_start
: findEndDate(evaluate_amount * 3, assign.date_start);
const commanderData = await this.assignDirectorRepository.findOne({
select: ["personal_id", "dated", "fullname", "position", "posType", "posLevel"],
where: { personal_id: director_id },
})
if (!commanderData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้บังคับบัญชา")
}
const commander = await {
...commanderData,
name: commanderData.fullname,
label: `${commanderData.fullname} (${commanderData.position}${commanderData.posLevel})`,
}
const commanderData = await this.assignDirectorRepository.findOne({
select: ["personal_id", "dated", "fullname", "position", "posType", "posLevel"],
where: { personal_id: director_id },
});
if (!commanderData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้บังคับบัญชา");
}
const commander = await {
...commanderData,
name: commanderData.fullname,
label: `${commanderData.fullname} (${commanderData.position}${commanderData.posLevel})`,
};
return new HttpSuccess({
person: profile,
assign,
evaluate_no: evaluate_no,
start_date: start_date,
end_date: findEndDate(3, start_date),
director: commander,
})
}
return new HttpSuccess({
person: profile,
assign,
evaluate_no: evaluate_no,
start_date: start_date,
end_date: findEndDate(3, start_date),
director: commander,
});
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
}
/**
* API ()
*
* @summary ()
*
*/
@Get("")
async GetEvaluate(@Request() request: RequestWithUser, @Query() assign_id: string, @Query() evaluate_no?: string) {
await new permission().PermissionGet(request, "SYS_PROBATION")
/**
* API ()
*
* @summary ()
*
*/
@Get("")
async GetEvaluate(
@Request() request: RequestWithUser,
@Query() assign_id: string,
@Query() evaluate_no?: string,
) {
try {
await new permission().PermissionGet(request, "SYS_PROBATION");
// ต้องปรับเป็น id ของคนที่ access เข้ามา
const director = await this.assignDirectorRepository.findOne({
select: ["personal_id"],
where: {
assign_id,
role: "commander",
},
})
if (!director) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล")
}
const director_id = director.personal_id
let evaluate: any = null
if (evaluate_no) {
evaluate = await this.evaluateCommanderRepository.findOne({
where: {
director_id,
assign_id,
no: evaluate_no,
},
})
} else {
evaluate = await this.evaluateCommanderRepository.find({
where: {
director_id,
assign_id,
},
})
// ต้องปรับเป็น id ของคนที่ access เข้ามา
const director = await this.assignDirectorRepository.findOne({
select: ["personal_id"],
where: {
assign_id,
role: "commander",
},
});
if (!director) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
}
const director_id = director.personal_id;
let evaluate: any = null;
if (evaluate_no) {
evaluate = await this.evaluateCommanderRepository.findOne({
where: {
director_id,
assign_id,
no: evaluate_no,
},
});
} else {
evaluate = await this.evaluateCommanderRepository.find({
where: {
director_id,
assign_id,
},
});
if (evaluate)
evaluate = await evaluate.map((element: EvaluateCommander) => ({
...element,
no: Number(element.no),
}))
}
if (evaluate)
evaluate = await evaluate.map((element: EvaluateCommander) => ({
...element,
no: Number(element.no),
}));
}
if (!evaluate) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบประเมิน")
}
if (!evaluate) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบประเมิน");
}
const assign = await this.assignRepository.findOne({
where: { id: assign_id },
})
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน")
}
const assign = await this.assignRepository.findOne({
where: { id: assign_id },
});
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
}
// const profile = await (assign.profile
// ? {
// ...assign.profile,
// id: assign.profile.personal_id,
// name:
// assign.profile.prefixName +
// assign.profile.firstName +
// " " +
// assign.profile.lastName,
// Oc: assign.profile.organization,
// }
// : null);
// const profile = await (assign.profile
// ? {
// ...assign.profile,
// id: assign.profile.personal_id,
// name:
// assign.profile.prefixName +
// assign.profile.firstName +
// " " +
// assign.profile.lastName,
// Oc: assign.profile.organization,
// }
// : null);
// const evaluate_amount = await this.evaluateCommanderRepository.count({
// where: {
// assign_id,
// director_id,
// },
// });
// const evaluate_no = await (evaluate_amount + 1);
// const start_date =
// evaluate_amount == 0
// ? assign.date_start
// : findEndDate(evaluate_amount * 3, assign.date_start);
// const evaluate_amount = await this.evaluateCommanderRepository.count({
// where: {
// assign_id,
// director_id,
// },
// });
// const evaluate_no = await (evaluate_amount + 1);
// const start_date =
// evaluate_amount == 0
// ? assign.date_start
// : findEndDate(evaluate_amount * 3, assign.date_start);
const directorData = await this.assignDirectorRepository.find({
select: ["personal_id", "dated", "fullname", "position", "posType", "posLevel"],
where: { personal_id: director_id },
})
const directorData = await this.assignDirectorRepository.find({
select: ["personal_id", "dated", "fullname", "position", "posType", "posLevel"],
where: { personal_id: director_id },
});
const directors = await directorData.map(element => ({
...element,
name: element.fullname,
label: `${element.fullname} (${element.position}${element.posLevel})`,
}))
const directors = await directorData.map((element) => ({
...element,
name: element.fullname,
label: `${element.fullname} (${element.position}${element.posLevel})`,
}));
const experimenteeData = await this.personalRepository.find({
select: ["personal_id", "prefixName", "firstName", "lastName", "positionName", "positionLevelName", "organization"],
where: { personal_id: assign.personal_id },
})
const experimenteeData = await this.personalRepository.find({
select: [
"personal_id",
"prefixName",
"firstName",
"lastName",
"positionName",
"positionLevelName",
"organization",
],
where: { personal_id: assign.personal_id },
});
const experimentee = await experimenteeData.map(element => ({
...element,
name: element.prefixName + element.firstName + " " + element.lastName,
Oc: element.organization,
}))
const experimentee = await experimenteeData.map((element) => ({
...element,
name: element.prefixName + element.firstName + " " + element.lastName,
Oc: element.organization,
}));
return new HttpSuccess({
experimentee: experimentee,
director: directors ? directors : null,
assign,
evaluate,
})
}
return new HttpSuccess({
experimentee: experimentee,
director: directors ? directors : null,
assign,
evaluate,
});
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
}
/**
* API ()
*
* @summary ()
*
*/
@Post("")
async PostData(@Query() assign_id: string, @Body() requestBody: CreateEvaluateCommander, @Request() request: RequestWithUser) {
await new permission().PermissionUpdate(request, "SYS_PROBATION")
/**
* API ()
*
* @summary ()
*
*/
@Post("")
async PostData(
@Query() assign_id: string,
@Body() requestBody: CreateEvaluateCommander,
@Request() request: RequestWithUser,
) {
try {
await new permission().PermissionUpdate(request, "SYS_PROBATION");
const director = await this.assignDirectorRepository.findOne({
select: ["personal_id"],
where: {
assign_id,
role: "commander",
},
})
if (!director) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล")
}
const director = await this.assignDirectorRepository.findOne({
select: ["personal_id"],
where: {
assign_id,
role: "commander",
},
});
if (!director) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
}
const director_id = director.personal_id
const director_id = director.personal_id;
const assign = await this.assignRepository.findOne({
relations: ["profile"],
where: { id: assign_id },
})
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน")
}
const assign = await this.assignRepository.findOne({
relations: ["profile"],
where: { id: assign_id },
});
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
}
const postData: any = await {
assign_id,
...requestBody,
director_id,
no: requestBody.evaluate_no,
date_start: requestBody.start_date,
personal_id: assign.personal_id,
const postData: any = await {
assign_id,
...requestBody,
director_id,
no: requestBody.evaluate_no,
date_start: requestBody.start_date,
personal_id: assign.personal_id,
achievement_other_desc: requestBody.achievement_other ? requestBody.achievement_other.text : "",
achievement_other_level: requestBody.achievement_other ? Number(requestBody.achievement_other.level) : 0,
behavior_other_desc: requestBody.behavior_orther.text,
behavior_other_level: requestBody.behavior_orther.text != "" ? Number(requestBody.behavior_orther.level) : 0,
achievement_other_desc: requestBody.achievement_other
? requestBody.achievement_other.text
: "",
achievement_other_level: requestBody.achievement_other
? Number(requestBody.achievement_other.level)
: 0,
behavior_other_desc: requestBody.behavior_orther.text,
behavior_other_level:
requestBody.behavior_orther.text != "" ? Number(requestBody.behavior_orther.level) : 0,
createdUserId: request.user.sub,
createdFullName: request.user.name,
updateUserId: request.user.sub,
updateFullName: request.user.name,
}
createdUserId: request.user.sub,
createdFullName: request.user.name,
updateUserId: request.user.sub,
updateFullName: request.user.name,
};
await this.evaluateCommanderRepository.save(postData, {
data: request,
})
setLogDataDiff(request, { before: null, after: postData })
await this.evaluateCommanderRepository.save(postData, {
data: request,
});
setLogDataDiff(request, { before: null, after: postData });
if (Number(requestBody.evaluate_no) < 2) {
// #noted cronjob
// แจ้งผู้บังคับบัญชาเข้ามาบันทึกผลทุก 3 เดือน 2 ครั้ง
var dateSend = await findEndDate(3, requestBody.start_date)
const nextNo = await (Number(requestBody.evaluate_no) + 1)
await new CallAPI()
.PostData(request, "/placement/noti", {
subject: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการครั้งที่ ${nextNo} ${assign.profile.prefixName}${assign.profile.firstName} ${assign.profile.lastName}`,
body: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการ (สำหรับผู้บังคับบัญชา) ครั้งที่ ${nextNo} ${assign.profile.prefixName}${assign.profile.firstName} ${assign.profile.lastName}`,
receiverUserId: director_id,
payload: "",
isSendMail: true,
isSendInbox: true,
receiveDate: dateSend,
})
.catch(error => {
console.error("Error calling API:", error)
})
}
if (Number(requestBody.evaluate_no) < 2) {
// #noted cronjob
// แจ้งผู้บังคับบัญชาเข้ามาบันทึกผลทุก 3 เดือน 2 ครั้ง
var dateSend = await findEndDate(3, requestBody.start_date);
const nextNo = await (Number(requestBody.evaluate_no) + 1);
await new CallAPI()
.PostData(request, "/placement/noti", {
subject: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการครั้งที่ ${nextNo} ${assign.profile.prefixName}${assign.profile.firstName} ${assign.profile.lastName}`,
body: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการ (สำหรับผู้บังคับบัญชา) ครั้งที่ ${nextNo} ${assign.profile.prefixName}${assign.profile.firstName} ${assign.profile.lastName}`,
receiverUserId: director_id,
payload: "",
isSendMail: true,
isSendInbox: true,
receiveDate: dateSend,
})
.catch((error) => {
console.error("Error calling API:", error);
});
}
return new HttpSuccess()
}
return new HttpSuccess();
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
}
/**
* API ()
*
* @summary ()
*
*/
@Put("")
async UpdateData(
// @Query() assign_id: string,
@Query() evaluate_id: string,
@Body() requestBody: CreateEvaluateCommander,
@Request() request: RequestWithUser
) {
await new permission().PermissionUpdate(request, "SYS_PROBATION")
/**
* API ()
*
* @summary ()
*
*/
@Put("")
async UpdateData(
// @Query() assign_id: string,
@Query() evaluate_id: string,
@Body() requestBody: CreateEvaluateCommander,
@Request() request: RequestWithUser,
) {
try {
await new permission().PermissionUpdate(request, "SYS_PROBATION");
let evaluate = await this.evaluateCommanderRepository.findOne({
where: { id: evaluate_id },
})
let evaluate = await this.evaluateCommanderRepository.findOne({
where: { id: evaluate_id },
});
const before = evaluate
const before = evaluate;
if (!evaluate) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมิน")
}
if (!evaluate) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมิน");
}
evaluate.commander_dated = requestBody.commander_dated
evaluate.knowledge_level = requestBody.knowledge_level
evaluate.skill_level = requestBody.skill_level
evaluate.competency_level = requestBody.competency_level
evaluate.learn_level = requestBody.learn_level
evaluate.apply_level = requestBody.apply_level
evaluate.success_level = requestBody.success_level
evaluate.achievement_other_desc = requestBody.achievement_other ? requestBody.achievement_other.text : ""
evaluate.achievement_other_level = requestBody.achievement_other.text != "" ? Number(requestBody.achievement_other.level) : 0
evaluate.commander_dated = requestBody.commander_dated;
evaluate.knowledge_level = requestBody.knowledge_level;
evaluate.skill_level = requestBody.skill_level;
evaluate.competency_level = requestBody.competency_level;
evaluate.learn_level = requestBody.learn_level;
evaluate.apply_level = requestBody.apply_level;
evaluate.success_level = requestBody.success_level;
evaluate.achievement_other_desc = requestBody.achievement_other
? requestBody.achievement_other.text
: "";
evaluate.achievement_other_level =
requestBody.achievement_other.text != "" ? Number(requestBody.achievement_other.level) : 0;
evaluate.conduct1_level = requestBody.conduct1_level
evaluate.conduct2_level = requestBody.conduct2_level
evaluate.conduct3_level = requestBody.conduct3_level
evaluate.conduct4_level = requestBody.conduct4_level
evaluate.moral1_level = requestBody.moral1_level
evaluate.moral2_level = requestBody.moral2_level
evaluate.moral3_level = requestBody.moral3_level
evaluate.discipline1_level = requestBody.discipline1_level
evaluate.discipline2_level = requestBody.discipline2_level
evaluate.discipline3_level = requestBody.discipline3_level
evaluate.discipline4_level = requestBody.discipline4_level
evaluate.discipline5_level = requestBody.discipline5_level
evaluate.behavior_other_desc = requestBody.behavior_orther.text
evaluate.behavior_other_level = requestBody.behavior_orther.text != "" ? Number(requestBody.behavior_orther.level) : 0
evaluate.behavior_strength_desc = requestBody.behavior_strength_desc
evaluate.behavior_improve_desc = requestBody.behavior_improve_desc
evaluate.orientation = requestBody.orientation
evaluate.self_learning = requestBody.self_learning
evaluate.training_seminar = requestBody.training_seminar
evaluate.other_training = requestBody.other_training
evaluate.updateUserId = request.user.sub
evaluate.updateFullName = request.user.name
evaluate.conduct1_level = requestBody.conduct1_level;
evaluate.conduct2_level = requestBody.conduct2_level;
evaluate.conduct3_level = requestBody.conduct3_level;
evaluate.conduct4_level = requestBody.conduct4_level;
evaluate.moral1_level = requestBody.moral1_level;
evaluate.moral2_level = requestBody.moral2_level;
evaluate.moral3_level = requestBody.moral3_level;
evaluate.discipline1_level = requestBody.discipline1_level;
evaluate.discipline2_level = requestBody.discipline2_level;
evaluate.discipline3_level = requestBody.discipline3_level;
evaluate.discipline4_level = requestBody.discipline4_level;
evaluate.discipline5_level = requestBody.discipline5_level;
evaluate.behavior_other_desc = requestBody.behavior_orther.text;
evaluate.behavior_other_level =
requestBody.behavior_orther.text != "" ? Number(requestBody.behavior_orther.level) : 0;
evaluate.behavior_strength_desc = requestBody.behavior_strength_desc;
evaluate.behavior_improve_desc = requestBody.behavior_improve_desc;
evaluate.orientation = requestBody.orientation;
evaluate.self_learning = requestBody.self_learning;
evaluate.training_seminar = requestBody.training_seminar;
evaluate.other_training = requestBody.other_training;
evaluate.updateUserId = request.user.sub;
evaluate.updateFullName = request.user.name;
await this.evaluateCommanderRepository.save(evaluate, { data: request })
setLogDataDiff(request, { before, after: evaluate })
await this.evaluateCommanderRepository.save(evaluate, { data: request });
setLogDataDiff(request, { before, after: evaluate });
return new HttpSuccess()
}
return new HttpSuccess();
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
}
}

File diff suppressed because it is too large Load diff

View file

@ -49,167 +49,175 @@ 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");
try {
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"],
where: { id: assign_id },
});
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
}
const profile = await (assign.profile
? {
...assign.profile,
id: assign.profile.personal_id,
name:
assign.profile.prefixName + assign.profile.firstName + " " + assign.profile.lastName,
Oc: assign.profile.organization,
}
: null);
const directorData = await this.assignDirectorRepository.find({
where: { assign_id },
order: { ordering: "ASC" },
});
if (!directorData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน");
}
let mentors = [];
const mentorList = await directorData.filter((x) => x.role == "mentor");
if (mentorList.length > 0) {
for (let index = 0; index < mentorList.length; index++) {
const e = await mentorList[index];
mentors.push({
personal_id: e.personal_id,
dated: e.dated,
name: e.fullname,
label: e.fullname + " " + (e.position ? `(${e.position}${e.posLevel})` : ""),
position: e.position,
posType: e.posType,
posLevel: e.posLevel,
});
const assign = await this.assignRepository.findOne({
relations: ["profile"],
where: { id: assign_id },
});
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
}
}
const commanderData = await (directorData.find((x) => x.role == "commander") ?? null);
const commander =
commanderData != null
const profile = await (assign.profile
? {
personal_id: commanderData.personal_id,
dated: commanderData.dated,
name: commanderData.fullname,
label:
commanderData.fullname +
" " +
(commanderData.position
? `(${commanderData.position}${commanderData.posLevel})`
: ""),
position: commanderData.position,
posType: commanderData.posType,
posLevel: commanderData.posLevel,
...assign.profile,
id: assign.profile.personal_id,
name:
assign.profile.prefixName + assign.profile.firstName + " " + assign.profile.lastName,
Oc: assign.profile.organization,
}
: null;
: null);
const chairmanData = await (directorData.find((x) => x.role == "chairman") ?? null);
const chairman =
chairmanData != null
? {
personal_id: chairmanData.personal_id,
dated: chairmanData.dated,
name: chairmanData.fullname,
label:
chairmanData.fullname +
" " +
(chairmanData.position ? `(${chairmanData.position}${chairmanData.posLevel})` : ""),
position: chairmanData.position,
posType: chairmanData.posType,
posLevel: chairmanData.posLevel,
}
: null;
const directorData = await this.assignDirectorRepository.find({
where: { assign_id },
order: { ordering: "ASC" },
});
const resultData = await this.evaluateChairmanRepository.find({
select: [
"develop_orientation_score",
"develop_self_learning_score",
"develop_training_seminar_score",
"evaluate_result",
"no",
],
where: {
assign_id,
},
});
if (!directorData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน");
}
if (!resultData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมินผล");
}
let mentors = [];
const mentorList = await directorData.filter((x) => x.role == "mentor");
if (mentorList.length > 0) {
for (let index = 0; index < mentorList.length; index++) {
const e = await mentorList[index];
const result = await Promise.all(
resultData.map(async (e) => {
const check = await this.evaluateResultRepository.count({ where: { assign_id, no: e.no } });
const develop_complete =
e.develop_orientation_score > 0 &&
e.develop_self_learning_score > 0 &&
e.develop_training_seminar_score
? 1
: 2;
const evaluate_result = e.evaluate_result === 1 ? 1 : 2;
let startDate = assign.date_start;
if (e.no === "2") {
const resultNo1 = await this.evaluateResultRepository.findOne({
select: ["date_finish"],
where: { assign_id, no: "1" },
mentors.push({
personal_id: e.personal_id,
dated: e.dated,
name: e.fullname,
label: e.fullname + " " + (e.position ? `(${e.position}${e.posLevel})` : ""),
position: e.position,
posType: e.posType,
posLevel: e.posLevel,
});
startDate = resultNo1?.date_finish ?? assign.date_start;
}
}
let endDate: any = assign.date_finish;
if (e.no === "1") {
endDate = findEndDate(3, assign.date_start) ?? assign.date_finish;
}
const commanderData = await (directorData.find((x) => x.role == "commander") ?? null);
return {
develop_complete,
evaluate_result,
evaluate_no: Number(e.no),
isResult: check > 0 ? true : false,
start_date: startDate,
end_date: endDate,
};
}),
);
const commander =
commanderData != null
? {
personal_id: commanderData.personal_id,
dated: commanderData.dated,
name: commanderData.fullname,
label:
commanderData.fullname +
" " +
(commanderData.position
? `(${commanderData.position}${commanderData.posLevel})`
: ""),
position: commanderData.position,
posType: commanderData.posType,
posLevel: commanderData.posLevel,
}
: null;
// const develop_complete = await (resultData.develop_orientation_score > 0 &&
// resultData.develop_self_learning_score > 0 &&
// resultData.develop_training_seminar_score > 0
// ? 1
// : 2);
const chairmanData = await (directorData.find((x) => x.role == "chairman") ?? null);
const chairman =
chairmanData != null
? {
personal_id: chairmanData.personal_id,
dated: chairmanData.dated,
name: chairmanData.fullname,
label:
chairmanData.fullname +
" " +
(chairmanData.position ? `(${chairmanData.position}${chairmanData.posLevel})` : ""),
position: chairmanData.position,
posType: chairmanData.posType,
posLevel: chairmanData.posLevel,
}
: null;
// const evaluate_result = await (resultData.evaluate_result == 1 ? 1 : 2);
const resultData = await this.evaluateChairmanRepository.find({
select: [
"develop_orientation_score",
"develop_self_learning_score",
"develop_training_seminar_score",
"evaluate_result",
"no",
],
where: {
assign_id,
},
});
// const result = await {
// develop_complete: develop_complete,
// evaluate_result: evaluate_result,
// };
if (!resultData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมินผล");
}
return new HttpSuccess({
person: profile,
assign,
result,
mentors,
commander,
chairman,
});
const result = await Promise.all(
resultData.map(async (e) => {
const check = await this.evaluateResultRepository.count({
where: { assign_id, no: e.no },
});
const develop_complete =
e.develop_orientation_score > 0 &&
e.develop_self_learning_score > 0 &&
e.develop_training_seminar_score
? 1
: 2;
const evaluate_result = e.evaluate_result === 1 ? 1 : 2;
let startDate = assign.date_start;
if (e.no === "2") {
const resultNo1 = await this.evaluateResultRepository.findOne({
select: ["date_finish"],
where: { assign_id, no: "1" },
});
startDate = resultNo1?.date_finish ?? assign.date_start;
}
let endDate: any = assign.date_finish;
if (e.no === "1") {
endDate = findEndDate(3, assign.date_start) ?? assign.date_finish;
}
return {
develop_complete,
evaluate_result,
evaluate_no: Number(e.no),
isResult: check > 0 ? true : false,
start_date: startDate,
end_date: endDate,
};
}),
);
// 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,
assign,
result,
mentors,
commander,
chairman,
});
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
}
/**
@ -224,150 +232,167 @@ export class EvaluateResultController extends Controller {
@Query() assign_id: string,
@Query() evaluate_no?: string,
) {
await new permission().PermissionGet(request, "SYS_PROBATION");
try {
await new permission().PermissionGet(request, "SYS_PROBATION");
// ต้องปรับเป็น id ของคนที่ access เข้ามา
const director = await this.assignDirectorRepository.findOne({
select: ["personal_id"],
where: {
assign_id,
role: "chairman",
},
});
if (!director) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
}
const director_id = director.personal_id;
const evaluate = await this.evaluateResultRepository.findOne({
where: {
director_id,
assign_id,
no: evaluate_no ?? "1",
},
});
if (!evaluate) {
return new HttpSuccess(null);
}
const assign = await this.assignRepository.findOne({
where: { id: assign_id },
});
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
}
const experimenteeData = await this.personalRepository.findOne({
select: [
"personal_id",
"prefixName",
"firstName",
"lastName",
"positionName",
"positionLevelName",
"organization",
"orgRootName",
],
where: { personal_id: assign.personal_id },
});
if (!experimenteeData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล");
}
const splitOc = await experimenteeData.organization.split(" ");
const splitOcAmount = await splitOc.length;
const experimentee = await {
...experimenteeData,
name:
experimenteeData.prefixName + experimenteeData.firstName + " " + experimenteeData.lastName,
PositionLevel: experimenteeData.positionName + experimenteeData.positionLevelName,
Department: splitOcAmount > 2 ? splitOc[splitOcAmount - 3] : "-",
OrganizationOrganization: splitOcAmount > 1 ? splitOc[splitOcAmount - 2] : "-",
Oc: experimenteeData.orgRootName,
};
const directorData = await this.assignDirectorRepository.find({
where: { assign_id },
order: { ordering: "ASC" },
});
if (!directorData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน");
}
let mentors = [];
const mentorList = await directorData.filter((x) => x.role == "mentor");
if (mentorList.length > 0) {
for (let index = 0; index < mentorList.length; index++) {
const e = await mentorList[index];
mentors.push({
personal_id: e.personal_id,
dated: e.dated,
name: e.fullname,
label: e.fullname + " " + (e.position ? `(${e.position}${e.posLevel})` : ""),
position: e.position + e.posLevel,
posType: e.posType,
posLevel: e.posLevel,
});
// ต้องปรับเป็น id ของคนที่ access เข้ามา
const director = await this.assignDirectorRepository.findOne({
select: ["personal_id"],
where: {
assign_id,
role: "chairman",
},
});
if (!director) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
}
const director_id = director.personal_id;
const evaluate = await this.evaluateResultRepository.findOne({
where: {
director_id,
assign_id,
no: evaluate_no ?? "1",
},
});
if (!evaluate) {
return new HttpSuccess(null);
}
const assign = await this.assignRepository.findOne({
where: { id: assign_id },
});
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
}
const experimenteeData = await this.personalRepository.findOne({
select: [
"personal_id",
"prefixName",
"firstName",
"lastName",
"positionName",
"positionLevelName",
"organization",
"orgRootName",
"orgChild1Name",
"orgChild2Name",
"orgChild3Name",
"orgChild4Name",
],
where: { personal_id: assign.personal_id },
});
if (!experimenteeData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล");
}
// const splitOc = await experimenteeData.organization.split(" ");
// const splitOcAmount = await splitOc.length;
const experimentee = await {
...experimenteeData,
name:
experimenteeData.prefixName +
experimenteeData.firstName +
" " +
experimenteeData.lastName,
PositionLevel: experimenteeData.positionName + experimenteeData.positionLevelName,
OrganizationOrganization: experimenteeData.orgChild2Name
? (experimenteeData.orgChild4Name ? experimenteeData.orgChild4Name + " " : "") +
(experimenteeData.orgChild3Name ? experimenteeData.orgChild3Name + " " : "") +
(experimenteeData.orgChild2Name ? experimenteeData.orgChild2Name + " " : "")
: "-",
Department: experimenteeData.orgChild1Name ?? "-",
Oc: experimenteeData.orgRootName,
};
const directorData = await this.assignDirectorRepository.find({
where: { assign_id },
order: { ordering: "ASC" },
});
if (!directorData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน");
}
let mentors = [];
const mentorList = await directorData.filter((x) => x.role == "mentor");
if (mentorList.length > 0) {
for (let index = 0; index < mentorList.length; index++) {
const e = await mentorList[index];
mentors.push({
personal_id: e.personal_id,
dated: e.dated,
name: e.fullname,
label: e.fullname + " " + (e.position ? `(${e.position}${e.posLevel})` : ""),
position: e.position + e.posLevel,
posType: e.posType,
posLevel: e.posLevel,
});
}
}
// const commanderData = await (directorData.find((x) => x.role == "commander") ?? null);
// const commander =
// commanderData != null
// ? {
// personal_id: commanderData.personal_id,
// dated: commanderData.dated,
// name: commanderData.fullname,
// label:
// commanderData.fullname +
// " " +
// (commanderData.position
// ? `(${commanderData.position}${commanderData.posLevel})`
// : ""),
// position: commanderData.position + commanderData.posLevel,
// posType: commanderData.posType,
// posLevel: commanderData.posLevel,
// }
// : null;
const commander = {
dated: evaluate.authority_dated,
name: evaluate.authority_name,
position: evaluate.authority_pos + evaluate.authority_level,
posType: evaluate.authority_type,
posLevel: evaluate.authority_level,
};
const chairmanData = await (directorData.find((x) => x.role == "chairman") ?? null);
const chairman =
chairmanData != null
? {
personal_id: chairmanData.personal_id,
dated: chairmanData.dated,
name: chairmanData.fullname,
label:
chairmanData.fullname +
" " +
(chairmanData.position ? `(${chairmanData.position}${chairmanData.posLevel})` : ""),
position: chairmanData.position + chairmanData.posLevel,
posType: chairmanData.posType,
posLevel: chairmanData.posLevel,
}
: null;
return new HttpSuccess({
commander,
chairman,
mentors,
experimentee,
assign,
evaluate: evaluate ? evaluate : null,
});
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
// const commanderData = await (directorData.find((x) => x.role == "commander") ?? null);
// const commander =
// commanderData != null
// ? {
// personal_id: commanderData.personal_id,
// dated: commanderData.dated,
// name: commanderData.fullname,
// label:
// commanderData.fullname +
// " " +
// (commanderData.position
// ? `(${commanderData.position}${commanderData.posLevel})`
// : ""),
// position: commanderData.position + commanderData.posLevel,
// posType: commanderData.posType,
// posLevel: commanderData.posLevel,
// }
// : null;
const commander = {
dated: evaluate.authority_dated,
name: evaluate.authority_name,
position: evaluate.authority_pos + evaluate.authority_level,
posType: evaluate.authority_type,
posLevel: evaluate.authority_level,
};
const chairmanData = await (directorData.find((x) => x.role == "chairman") ?? null);
const chairman =
chairmanData != null
? {
personal_id: chairmanData.personal_id,
dated: chairmanData.dated,
name: chairmanData.fullname,
label:
chairmanData.fullname +
" " +
(chairmanData.position ? `(${chairmanData.position}${chairmanData.posLevel})` : ""),
position: chairmanData.position + chairmanData.posLevel,
posType: chairmanData.posType,
posLevel: chairmanData.posLevel,
}
: null;
return new HttpSuccess({
commander,
chairman,
mentors,
experimentee,
assign,
evaluate: evaluate ? evaluate : null,
});
}
/**
@ -382,50 +407,56 @@ export class EvaluateResultController extends Controller {
@Body() requestBody: CreateEvaluateResult,
@Request() request: RequestWithUser,
) {
await new permission().PermissionUpdate(request, "SYS_PROBATION");
try {
await new permission().PermissionUpdate(request, "SYS_PROBATION");
const director = await this.assignDirectorRepository.findOne({
select: ["personal_id"],
where: {
const director = await this.assignDirectorRepository.findOne({
select: ["personal_id"],
where: {
assign_id,
role: "chairman",
},
});
if (!director) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
}
const director_id = director.personal_id;
const assign = await this.assignRepository.findOne({
relations: ["profile"],
where: { id: assign_id },
});
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
}
const postData: any = await {
assign_id,
role: "chairman",
},
});
if (!director) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
...requestBody,
director_id,
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,
createdUserId: request.user.sub,
createdFullName: request.user.name,
updateUserId: request.user.sub,
updateFullName: request.user.name,
};
await this.evaluateResultRepository.save(postData, {
data: request,
});
setLogDataDiff(request, { before: null, after: postData });
return new HttpSuccess();
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
const director_id = director.personal_id;
const assign = await this.assignRepository.findOne({
relations: ["profile"],
where: { id: assign_id },
});
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
}
const postData: any = await {
assign_id,
...requestBody,
director_id,
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,
createdUserId: request.user.sub,
createdFullName: request.user.name,
updateUserId: request.user.sub,
updateFullName: request.user.name,
};
await this.evaluateResultRepository.save(postData, {
data: request,
});
setLogDataDiff(request, { before: null, after: postData });
return new HttpSuccess();
}
/**
@ -440,60 +471,66 @@ export class EvaluateResultController extends Controller {
@Query() evaluate_no: number | string,
@Request() request: RequestWithUser,
) {
await new permission().PermissionUpdate(request, "SYS_PROBATION");
try {
await new permission().PermissionUpdate(request, "SYS_PROBATION");
const assign = await this.assignRepository.findOne({
relations: ["profile"],
where: { id: assign_id },
});
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
const assign = await this.assignRepository.findOne({
relations: ["profile"],
where: { id: assign_id },
});
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
}
const result = await this.evaluateResultRepository.findOne({
where: { assign_id, no: evaluate_no.toString() },
});
if (!result) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผลการประเมิน");
}
const personal = await this.personalRepository.findOne({
where: { personal_id: assign.personal_id },
});
if (!personal) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล");
}
personal.probation_status =
result.pass_result == 1
? 2 // ไม่ต่ำกว่ามาตรฐานที่กำหนด เห็นควรให้รับราชการต่อ
: result.pass_result == 2
? 3 // ต่ำกว่ามาตรฐานที่กำหนด เห็นควรให้ออกจากราชการ
: result.pass_result == 4
? 1 // ไม่ต่ำกว่ามาตรฐานที่กำหนด เห็นควรให้ทดลองปฏิบัติหน้าที่ราชการต่อไป
: personal.probation_status;
if (result.pass_result == 3) {
personal.probation_status = 7;
// #noti ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ กรณีขยายระยะเวลา
await new CallAPI()
.PostData(request, "/placement/noti", {
subject: "ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ",
body: `ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ เห็นควรให้ขยายระยะเวลาทดลองปฏิบัติหน้าที่ราชการต่อไปอีก ${result.expand_month} เดือน`,
receiverUserId: assign.personal_id,
payload: "",
isSendMail: false,
isSendInbox: true,
isSendNotification: true,
})
.catch((error) => {
console.error("Error calling API:", error);
});
}
await this.personalRepository.save(personal, { data: request });
return new HttpSuccess();
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
const result = await this.evaluateResultRepository.findOne({
where: { assign_id, no: evaluate_no.toString() },
});
if (!result) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผลการประเมิน");
}
const personal = await this.personalRepository.findOne({
where: { personal_id: assign.personal_id },
});
if (!personal) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล");
}
personal.probation_status =
result.pass_result == 1
? 2 // ไม่ต่ำกว่ามาตรฐานที่กำหนด เห็นควรให้รับราชการต่อ
: result.pass_result == 2
? 3 // ต่ำกว่ามาตรฐานที่กำหนด เห็นควรให้ออกจากราชการ
: result.pass_result == 4
? 1 // ไม่ต่ำกว่ามาตรฐานที่กำหนด เห็นควรให้ทดลองปฏิบัติหน้าที่ราชการต่อไป
: personal.probation_status;
if (result.pass_result == 3) {
personal.probation_status = 7;
// #noti ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ กรณีขยายระยะเวลา
await new CallAPI()
.PostData(request, "/placement/noti", {
subject: "ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ",
body: `ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ เห็นควรให้ขยายระยะเวลาทดลองปฏิบัติหน้าที่ราชการต่อไปอีก ${result.expand_month} เดือน`,
receiverUserId: assign.personal_id,
payload: "",
isSendMail: false,
isSendInbox: true,
isSendNotification: true,
})
.catch((error) => {
console.error("Error calling API:", error);
});
}
await this.personalRepository.save(personal, { data: request });
return new HttpSuccess();
}
/**
@ -509,80 +546,86 @@ export class EvaluateResultController extends Controller {
@Body() requestBody: CreateEvaluateResult,
@Request() request: RequestWithUser,
) {
await new permission().PermissionUpdate(request, "SYS_PROBATION");
try {
await new permission().PermissionUpdate(request, "SYS_PROBATION");
let evaluate = await this.evaluateResultRepository.findOne({
where: { id: evaluate_id },
});
let evaluate = await this.evaluateResultRepository.findOne({
where: { id: evaluate_id },
});
const before = evaluate;
const before = evaluate;
if (!evaluate) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมิน");
if (!evaluate) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมิน");
}
evaluate.date_start = requestBody.start_date;
evaluate.date_finish = requestBody.date_finish;
evaluate.develop_complete = requestBody.develop_complete;
evaluate.pass_result = requestBody.pass_result;
evaluate.expand_month =
requestBody.pass_result && requestBody.pass_result == 3
? Number(requestBody.expand_month)
: 0;
evaluate.reson = requestBody.reson;
evaluate.chairman_dated = requestBody.chairman_dated;
// evaluate.director1_dated = requestBody.director1_dated;
// evaluate.director2_dated = requestBody.director2_dated;
evaluate.updateUserId = request.user.sub;
evaluate.updateFullName = request.user.name;
await this.evaluateResultRepository.save(evaluate, { data: request });
setLogDataDiff(request, { before, after: evaluate });
const assign = await this.assignRepository.findOne({
relations: ["profile"],
where: { id: assign_id },
});
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
}
const personal = await this.personalRepository.findOne({
where: { personal_id: assign.personal_id },
});
if (!personal) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล");
}
personal.probation_status =
requestBody.pass_result == 1
? 2 // ไม่ต่ำกว่ามาตรฐานที่กำหนด เห็นควรให้รับราชการต่อ
: requestBody.pass_result == 2
? 3 // ต่ำกว่ามาตรฐานที่กำหนด เห็นควรให้ออกจากราชการ
: requestBody.pass_result == 4
? 1 // ไม่ต่ำกว่ามาตรฐานที่กำหนด เห็นควรให้ทดลองปฏิบัติหน้าที่ราชการต่อไป
: personal.probation_status;
if (requestBody.pass_result == 3) {
personal.probation_status = 7;
// #noti ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ กรณีขยายระยะเวลา
await new CallAPI()
.PostData(request, "/placement/noti", {
subject: "ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ",
body: `ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ เห็นควรให้ขยายระยะเวลาทดลองปฏิบัติหน้าที่ราชการต่อไปอีก ${requestBody.expand_month} เดือน`,
receiverUserId: assign.personal_id,
payload: "",
isSendMail: false,
isSendInbox: true,
isSendNotification: true,
})
.catch((error) => {
console.error("Error calling API:", error);
});
}
await this.personalRepository.save(personal, { data: request });
return new HttpSuccess();
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
evaluate.date_start = requestBody.start_date;
evaluate.date_finish = requestBody.date_finish;
evaluate.develop_complete = requestBody.develop_complete;
evaluate.pass_result = requestBody.pass_result;
evaluate.expand_month =
requestBody.pass_result && requestBody.pass_result == 3
? Number(requestBody.expand_month)
: 0;
evaluate.reson = requestBody.reson;
evaluate.chairman_dated = requestBody.chairman_dated;
// evaluate.director1_dated = requestBody.director1_dated;
// evaluate.director2_dated = requestBody.director2_dated;
evaluate.updateUserId = request.user.sub;
evaluate.updateFullName = request.user.name;
await this.evaluateResultRepository.save(evaluate, { data: request });
setLogDataDiff(request, { before, after: evaluate });
const assign = await this.assignRepository.findOne({
relations: ["profile"],
where: { id: assign_id },
});
if (!assign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
}
const personal = await this.personalRepository.findOne({
where: { personal_id: assign.personal_id },
});
if (!personal) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล");
}
personal.probation_status =
requestBody.pass_result == 1
? 2 // ไม่ต่ำกว่ามาตรฐานที่กำหนด เห็นควรให้รับราชการต่อ
: requestBody.pass_result == 2
? 3 // ต่ำกว่ามาตรฐานที่กำหนด เห็นควรให้ออกจากราชการ
: requestBody.pass_result == 4
? 1 // ไม่ต่ำกว่ามาตรฐานที่กำหนด เห็นควรให้ทดลองปฏิบัติหน้าที่ราชการต่อไป
: personal.probation_status;
if (requestBody.pass_result == 3) {
personal.probation_status = 7;
// #noti ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ กรณีขยายระยะเวลา
await new CallAPI()
.PostData(request, "/placement/noti", {
subject: "ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ",
body: `ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ เห็นควรให้ขยายระยะเวลาทดลองปฏิบัติหน้าที่ราชการต่อไปอีก ${requestBody.expand_month} เดือน`,
receiverUserId: assign.personal_id,
payload: "",
isSendMail: false,
isSendInbox: true,
isSendNotification: true,
})
.catch((error) => {
console.error("Error calling API:", error);
});
}
await this.personalRepository.save(personal, { data: request });
return new HttpSuccess();
}
}

View file

@ -1,246 +1,436 @@
import { Controller, Post, Route, Security, Tags, Body, Request, SuccessResponse, Response, Get, Query } from "tsoa"
import { AppDataSource } from "../database/data-source"
import HttpSuccess from "../interfaces/http-success"
import HttpStatusCode from "../interfaces/http-status"
import HttpError from "../interfaces/http-error"
import { RequestWithUser } from "../middlewares/user"
import { setLogDataDiff } from "../interfaces/utils"
import { Personal, PostPersonal } from "../entities/Personal"
import permission from "../interfaces/permission"
import { Assign } from "../entities/Assign"
import { Brackets } from "typeorm"
import {
Controller,
Post,
Route,
Security,
Tags,
Body,
Request,
SuccessResponse,
Response,
Get,
Query,
} from "tsoa";
import { AppDataSource } from "../database/data-source";
import HttpSuccess from "../interfaces/http-success";
import HttpStatusCode from "../interfaces/http-status";
import HttpError from "../interfaces/http-error";
import { RequestWithUser } from "../middlewares/user";
import { setLogDataDiff } from "../interfaces/utils";
import { Personal, PostPersonal } from "../entities/Personal";
import permission from "../interfaces/permission";
import { Assign } from "../entities/Assign";
import { Brackets } from "typeorm";
import CallAPI from "../interfaces/call-api";
@Route("api/v1/probation/personal")
@Tags("Personal")
@Security("bearerAuth")
@Response(HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง")
@Response(
HttpStatusCode.INTERNAL_SERVER_ERROR,
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง"
)
export class PersonalController extends Controller {
private personalRepository = AppDataSource.getRepository(Personal)
private assignRepository = AppDataSource.getRepository(Assign)
private personalRepository = AppDataSource.getRepository(Personal);
private assignRepository = AppDataSource.getRepository(Assign);
/**
* API
*
* @summary
*
*/
@Post("add")
async AddPersonal(@Body() requestBody: PostPersonal, @Request() request: RequestWithUser) {
await new permission().PermissionCreate(request, "SYS_PROBATION")
/**
* API
*
* @summary
*
*/
@Post("add")
async AddPersonal(
@Body() requestBody: PostPersonal,
@Request() request: RequestWithUser
) {
try {
await new permission().PermissionCreate(request, "SYS_PROBATION");
const checkPersonal: number = await this.personalRepository.count({
where: { personal_id: requestBody.id },
})
if (checkPersonal > 0) {
throw new HttpError(HttpStatusCode.BAD_REQUEST, "ผู้ทดลองปฏิบัติหน้าที่ราชการนี้มีอยู่แล้ว")
}
const checkPersonal: number = await this.personalRepository.count({
where: { personal_id: requestBody.id },
});
if (checkPersonal > 0) {
throw new HttpError(
HttpStatusCode.BAD_REQUEST,
"ผู้ทดลองปฏิบัติหน้าที่ราชการนี้มีอยู่แล้ว"
);
}
let organization = await (requestBody.orgChild4Name ? requestBody.orgChild4Name + " " : "")
organization += await (requestBody.orgChild3Name ? requestBody.orgChild3Name + " " : "")
organization += await (requestBody.orgChild2Name ? requestBody.orgChild2Name + " " : "")
organization += await (requestBody.orgChild1Name ? requestBody.orgChild1Name + " " : "")
organization += await (requestBody.orgRootName ? requestBody.orgRootName : "")
let organization = await (requestBody.orgChild4Name
? requestBody.orgChild4Name + "\n"
: "");
organization += await (requestBody.orgChild3Name
? requestBody.orgChild3Name + "\n"
: "");
organization += await (requestBody.orgChild2Name
? requestBody.orgChild2Name + "\n"
: "");
organization += await (requestBody.orgChild1Name
? requestBody.orgChild1Name + "\n"
: "");
organization += await (requestBody.orgRootName
? requestBody.orgRootName
: "");
const personalData = Object.assign(new Personal())
personalData.personal_id = requestBody.id
personalData.order_number = requestBody.order_number ? requestBody.order_number : ""
personalData.probation_status = 1
personalData.createdUserId = request.user.sub
personalData.createdFullName = request.user.name
personalData.updateUserId = request.user.sub
personalData.updateFullName = request.user.name
const personalData = Object.assign(new Personal());
personalData.personal_id = requestBody.id;
personalData.order_number = requestBody.order_number
? requestBody.order_number
: "";
personalData.probation_status = 1;
personalData.createdUserId = request.user.sub;
personalData.createdFullName = request.user.name;
personalData.updateUserId = request.user.sub;
personalData.updateFullName = request.user.name;
personalData.idcard = requestBody.idcard
personalData.prefixName = requestBody.prefix
personalData.firstName = requestBody.firstName
personalData.lastName = requestBody.lastName
personalData.isProbation = requestBody.isProbation ? 1 : 0
personalData.positionLevelName = requestBody.posLevelName ? requestBody.posLevelName : ""
personalData.positionName = requestBody.position ? requestBody.position : ""
personalData.positionLineName = requestBody.posLineName
personalData.positionTypeName = requestBody.posTypeName
personalData.posNo = requestBody.posNo ? requestBody.posNo : ""
personalData.orgRootName = requestBody.orgRootName
personalData.organization = organization
personalData.idcard = requestBody.idcard;
personalData.prefixName = requestBody.prefix;
personalData.firstName = requestBody.firstName;
personalData.lastName = requestBody.lastName;
personalData.isProbation = requestBody.isProbation ? 1 : 0;
personalData.positionLevelName = requestBody.posLevelName
? requestBody.posLevelName
: "";
personalData.positionName = requestBody.position
? requestBody.position
: "";
personalData.positionLineName = requestBody.posLineName;
personalData.positionTypeName = requestBody.posTypeName;
personalData.posNo = requestBody.posNo ? requestBody.posNo : "";
personalData.orgRootName = requestBody.orgRootName;
personalData.organization = organization;
personalData.root = requestBody.root
personalData.child1 = requestBody.child1
personalData.child2 = requestBody.child2
personalData.child3 = requestBody.child3
personalData.child4 = requestBody.child4
personalData.root = requestBody.root;
personalData.child1 = requestBody.child1;
personalData.child2 = requestBody.child2;
personalData.child3 = requestBody.child3;
personalData.child4 = requestBody.child4;
personalData.rootDna = requestBody.rootDna
personalData.child1Dna = requestBody.child1Dna
personalData.child2Dna = requestBody.child2Dna
personalData.child3Dna = requestBody.child3Dna
personalData.child4Dna = requestBody.child4Dna
personalData.rootDna = requestBody.rootDna;
personalData.child1Dna = requestBody.orgChild1Dna;
personalData.child2Dna = requestBody.orgChild2Dna;
personalData.child3Dna = requestBody.orgChild3Dna;
personalData.child4Dna = requestBody.orgChild4Dna;
const before = null
const personal = await this.personalRepository.save(personalData, {
data: request,
})
setLogDataDiff(request, { before, after: personal })
const getFieldValue = (field: string | null | undefined): string =>
field ?? "";
personalData.orgChild1Name = getFieldValue(requestBody.orgChild1Name);
personalData.orgChild2Name = getFieldValue(requestBody.orgChild2Name);
personalData.orgChild3Name = getFieldValue(requestBody.orgChild3Name);
personalData.orgChild4Name = getFieldValue(requestBody.orgChild4Name);
return new HttpSuccess()
}
const before = null;
const personal = await this.personalRepository.save(personalData, {
data: request,
});
setLogDataDiff(request, { before, after: personal });
/**
* API
*
* @summary
*
*/
@Get("list")
async ListPersonal(@Query() status: string = "", @Query() keyword: string = "", @Query("page") page: number = 1, @Query("pageSize") pageSize: number = 10, @Request() request: RequestWithUser) {
await new permission().PermissionList(request, "SYS_PROBATION")
const _data = await new permission().PermissionOrgList(request, "SYS_PROBATION")
return new HttpSuccess();
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else
throw new HttpError(
HttpStatusCode.INTERNAL_SERVER_ERROR,
error.message
);
}
}
const conditions: any = {}
if (status) {
conditions.probation_status = status
}
/**
* API
*
* @summary
*
*/
@Get("list")
async ListPersonal(
@Query() status: string = "",
@Query() keyword: string = "",
@Query("page") page: number = 1,
@Query("pageSize") pageSize: number = 10,
@Request() request: RequestWithUser
) {
try {
// await new permission().PermissionList(request, "SYS_PROBATION");
// const _data = await new permission().PermissionOrgList(request, "SYS_PROBATION");
if (_data.root != undefined && _data.root != null && _data.root[0] != null) {
conditions.root = _data.root
}
let _data = await new permission().PermissionOrgList(
request,
"SYS_DEV_PROJECT"
);
await new CallAPI()
.PostData(request, "/org/finddna", _data)
.then((x) => {
_data = x;
})
.catch((x) => {});
if (_data.child1 != undefined && _data.child1 != null && _data.child1[0] != null) {
conditions.child1 = _data.child1
}
// const conditions: any = {};
// if (status) {
// conditions.probation_status = status;
// }
if (_data.child2 != undefined && _data.child2 != null && _data.child2[0] != null) {
conditions.child2 = _data.child2
}
// if (
// _data.root != undefined &&
// _data.root != null &&
// _data.root[0] != null
// ) {
// conditions.root = _data.root;
// }
if (_data.child3 != undefined && _data.child3 != null && _data.child3[0] != null) {
conditions.child3 = _data.child3
}
// if (
// _data.child1 != undefined &&
// _data.child1 != null &&
// _data.child1[0] != null
// ) {
// conditions.child1 = _data.child1;
// }
if (_data.child4 != undefined && _data.child4 != null && _data.child4[0] != null) {
conditions.child4 = _data.child4
}
// if (
// _data.child2 != undefined &&
// _data.child2 != null &&
// _data.child2[0] != null
// ) {
// conditions.child2 = _data.child2;
// }
const searchKeyword = await (keyword ? keyword.trim() : null)
// if (
// _data.child3 != undefined &&
// _data.child3 != null &&
// _data.child3[0] != null
// ) {
// conditions.child3 = _data.child3;
// }
const [lists, total] = await AppDataSource.getRepository(Personal)
.createQueryBuilder("personal")
.where(conditions)
.andWhere(
new Brackets(qb => {
qb.orWhere(searchKeyword ? `CONCAT(prefixName, firstName," ",lastName) like '%${keyword}%'` : "1=1", {
keyword: `%${searchKeyword}%`,
})
qb.orWhere(searchKeyword ? `positionName like '%${keyword}%'` : "1=1", {
keyword: `%${searchKeyword}%`,
})
qb.orWhere(searchKeyword ? `positionLevelName like '%${keyword}%'` : "1=1", {
keyword: `%${searchKeyword}%`,
})
qb.orWhere(searchKeyword ? `organization like '%${keyword}%'` : "1=1", {
keyword: `%${searchKeyword}%`,
})
qb.orWhere(searchKeyword ? `order_number like '%${keyword}%'` : "1=1", {
keyword: `%${searchKeyword}%`,
})
})
)
.orderBy("updatedAt", "DESC")
.skip((page - 1) * pageSize)
.take(pageSize)
.getManyAndCount()
// if (
// _data.child4 != undefined &&
// _data.child4 != null &&
// _data.child4[0] != null
// ) {
// conditions.child4 = _data.child4;
// }
if (!lists) {
throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, "ไม่สามารถแสดงข้อมูลได้")
}
const searchKeyword = await (keyword ? keyword.trim() : null);
let result: any = []
const [lists, total] = await AppDataSource.getRepository(Personal)
.createQueryBuilder("personal")
.andWhere(
_data.root != undefined && _data.root != null
? _data.root[0] != null
? `personal.rootDna IN (:...root)`
: `personal.rootDna is null`
: "1=1",
{
root: _data.root,
}
)
.andWhere(
_data.child1 != undefined && _data.child1 != null
? _data.child1[0] != null
? `personal.child1Dna IN (:...child1)`
: `personal.child1Dna is null`
: "1=1",
{
child1: _data.child1,
}
)
.andWhere(
_data.child2 != undefined && _data.child2 != null
? _data.child2[0] != null
? `personal.child2Dna IN (:...child2)`
: `personal.child2Dna is null`
: "1=1",
{
child2: _data.child2,
}
)
.andWhere(
_data.child3 != undefined && _data.child3 != null
? _data.child3[0] != null
? `personal.child3Dna IN (:...child3)`
: `personal.child3Dna is null`
: "1=1",
{
child3: _data.child3,
}
)
.andWhere(
_data.child4 != undefined && _data.child4 != null
? _data.child4[0] != null
? `personal.child4Dna IN (:...child4)`
: `personal.child4Dna is null`
: "1=1",
{
child4: _data.child4,
}
)
.andWhere(
new Brackets((qb) => {
qb.orWhere(
searchKeyword
? `CONCAT(prefixName, firstName," ",lastName) like '%${keyword}%'`
: "1=1",
{
keyword: `%${searchKeyword}%`,
}
);
qb.orWhere(
searchKeyword ? `positionName like '%${keyword}%'` : "1=1",
{
keyword: `%${searchKeyword}%`,
}
);
qb.orWhere(
searchKeyword ? `positionLevelName like '%${keyword}%'` : "1=1",
{
keyword: `%${searchKeyword}%`,
}
);
qb.orWhere(
searchKeyword ? `organization like '%${keyword}%'` : "1=1",
{
keyword: `%${searchKeyword}%`,
}
);
qb.orWhere(
searchKeyword ? `order_number like '%${keyword}%'` : "1=1",
{
keyword: `%${searchKeyword}%`,
}
);
})
)
.orderBy("updatedAt", "DESC")
.skip((page - 1) * pageSize)
.take(pageSize)
.getManyAndCount();
for (let i = 0; i < lists.length; i++) {
const probation_no = await this.assignRepository.count({
where: { personal_id: lists[i].personal_id },
})
if (!lists) {
throw new HttpError(
HttpStatusCode.INTERNAL_SERVER_ERROR,
"ไม่สามารถแสดงข้อมูลได้"
);
}
await result.push({
personal_id: lists[i].personal_id,
ordering: i + 1,
name: lists[i].prefixName + lists[i].firstName + " " + lists[i].lastName,
prefixName: lists[i].prefixName,
firstName: lists[i].firstName,
lastName: lists[i].lastName,
idcard: lists[i].idcard,
position_line: lists[i].positionName,
position_level: lists[i].positionLevelName,
position_type: lists[i].positionTypeName,
organization: lists[i].organization,
probation_no: probation_no,
order_number: lists[i].order_number,
probation_status: lists[i].probation_status,
})
}
// await Promise.all(
// lists.map(async (item, index) => {
// const probation_no = await this.assignRepository.count({
// where: {
// personal_id: item.personal_id,
// },
// });
let result: any = [];
// await result.push({
// personal_id: item.personal_id,
// ordering: index + 1,
// name: item.prefixName + item.firstName + " " + item.lastName,
// idcard: item.idcard,
// // prefixName: item.prefixName,
// // firstName: item.firstName,
// // lastName: item.lastName,
// position_line: item.positionName,
// position_level: item.positionLevelName,
// position_type: item.positionTypeName,
// organization: item.organization,
// probation_no: probation_no,
// order_number: item.order_number,
// probation_status: item.probation_status,
// });
// }),
// );
for (let i = 0; i < lists.length; i++) {
const probation_no = await this.assignRepository.count({
where: { personal_id: lists[i].personal_id },
});
return new HttpSuccess({ data: result, total: total })
}
await result.push({
personal_id: lists[i].personal_id,
ordering: i + 1,
name:
lists[i].prefixName + lists[i].firstName + " " + lists[i].lastName,
prefixName: lists[i].prefixName,
firstName: lists[i].firstName,
lastName: lists[i].lastName,
idcard: lists[i].idcard,
position_line: lists[i].positionName,
position_level: lists[i].positionLevelName,
position_type: lists[i].positionTypeName,
organization: lists[i].organization,
probation_no: probation_no,
order_number: lists[i].order_number,
probation_status: lists[i].probation_status,
});
}
// await Promise.all(
// lists.map(async (item, index) => {
// const probation_no = await this.assignRepository.count({
// where: {
// personal_id: item.personal_id,
// },
// });
/**
* API
*
* @summary
*
*/
@Get("")
async GetPersonal(@Request() request: RequestWithUser, @Query() personal_id: string) {
let _workflow = await new permission().Workflow(request, personal_id, "SYS_PROBATION")
if (_workflow == false) await new permission().PermissionGet(request, "SYS_PROBATION")
const person = await this.personalRepository.findOne({
where: { personal_id: personal_id },
})
// await result.push({
// personal_id: item.personal_id,
// ordering: index + 1,
// name: item.prefixName + item.firstName + " " + item.lastName,
// idcard: item.idcard,
// // prefixName: item.prefixName,
// // firstName: item.firstName,
// // lastName: item.lastName,
// position_line: item.positionName,
// position_level: item.positionLevelName,
// position_type: item.positionTypeName,
// organization: item.organization,
// probation_no: probation_no,
// order_number: item.order_number,
// probation_status: item.probation_status,
// });
// }),
// );
if (!person) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล")
}
return new HttpSuccess({ data: result, total: total });
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else
throw new HttpError(
HttpStatusCode.INTERNAL_SERVER_ERROR,
error.message
);
}
}
const probation_no = await this.assignRepository.count({
where: { personal_id: person.personal_id },
})
/**
* API
*
* @summary
*
*/
@Get("")
async GetPersonal(
@Request() request: RequestWithUser,
@Query() personal_id: string
) {
try {
let _workflow = await new permission().Workflow(
request,
personal_id,
"SYS_PROBATION"
);
if (_workflow == false)
await new permission().PermissionGet(request, "SYS_PROBATION");
const person = await this.personalRepository.findOne({
where: { personal_id: personal_id },
});
const result = await {
personal_id: person.personal_id,
name: person.prefixName + person.firstName + " " + person.lastName,
position_line: person.positionName,
position_level: person.positionLevelName,
position_type: person.positionTypeName,
organization: person.organization,
probation_no: probation_no,
order_number: person.order_number,
probation_status: person.probation_status,
}
if (!person) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล");
}
return new HttpSuccess(result)
}
const probation_no = await this.assignRepository.count({
where: { personal_id: person.personal_id },
});
const result = await {
personal_id: person.personal_id,
name: person.prefixName + person.firstName + " " + person.lastName,
position_line: person.positionName,
position_level: person.positionLevelName,
position_type: person.positionTypeName,
organization: person.organization,
probation_no: probation_no,
order_number: person.order_number,
probation_status: person.probation_status,
};
return new HttpSuccess(result);
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else
throw new HttpError(
HttpStatusCode.INTERNAL_SERVER_ERROR,
error.message
);
}
}
}

File diff suppressed because it is too large Load diff

View file

@ -1,132 +1,190 @@
import { Controller, Route, Security, Tags, Request, SuccessResponse, Response, Get, Post, Body, Query } from "tsoa"
import HttpSuccess from "../interfaces/http-success"
import HttpStatusCode from "../interfaces/http-status"
import HttpError from "../interfaces/http-error"
import { RequestWithUser } from "../middlewares/user"
import { setLogDataDiff } from "../interfaces/utils"
import { Survey } from "../entities/Survey"
import { Assign } from "../entities/Assign"
import { AppDataSource } from "../database/data-source"
import CallAPI from "../interfaces/call-api"
import permission from "../interfaces/permission"
import { Brackets } from "typeorm"
import {
Controller,
Route,
Security,
Tags,
Request,
SuccessResponse,
Response,
Get,
Post,
Body,
Query,
} from "tsoa";
import HttpSuccess from "../interfaces/http-success";
import HttpStatusCode from "../interfaces/http-status";
import HttpError from "../interfaces/http-error";
import { RequestWithUser } from "../middlewares/user";
import { setLogDataDiff } from "../interfaces/utils";
import { Survey } from "../entities/Survey";
import { Assign } from "../entities/Assign";
import { AppDataSource } from "../database/data-source";
import CallAPI from "../interfaces/call-api";
import permission from "../interfaces/permission";
import { Brackets } from "typeorm";
@Route("api/v1/probation/survey")
@Tags("Survey")
@Security("bearerAuth")
@Response(HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง")
@Response(
HttpStatusCode.INTERNAL_SERVER_ERROR,
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง"
)
export class SurveyController extends Controller {
private surveyRepository = AppDataSource.getRepository(Survey)
private assignRepository = AppDataSource.getRepository(Assign)
private surveyRepository = AppDataSource.getRepository(Survey);
private assignRepository = AppDataSource.getRepository(Assign);
/**
* API
*
* @summary
*
*/
@Get("")
async GetSurvey(@Request() request: RequestWithUser) {
const personalId = await new CallAPI().GetData(request, "/org/profile/keycloak").catch(error => {
console.error("Error calling API:", error)
})
/**
* API
*
* @summary
*
*/
@Get("")
async GetSurvey(@Request() request: RequestWithUser) {
try {
const personalId = await new CallAPI().GetData(
request,
"/org/profile/keycloak"
);
const dataAssign = await this.assignRepository.findOne({
select: ["id"],
where: { personal_id: personalId },
order: { date_start: "DESC" },
})
if (!dataAssign) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบผลการประเมินการทดลองปฏิบัติหน้าที่ราชการนี้")
}
const assign_id = dataAssign.id
const dataAssign = await this.assignRepository.findOne({
select: ["id"],
where: { personal_id: personalId },
order: { date_start: "DESC" },
});
if (!dataAssign) {
throw new HttpError(
HttpStatusCode.NOT_FOUND,
"ไม่พบผลการประเมินการทดลองปฏิบัติหน้าที่ราชการนี้"
);
}
const assign_id = dataAssign.id;
const data = await this.surveyRepository.findOne({
where: {
assign_id,
},
})
return new HttpSuccess({ data: data, assignId: assign_id })
}
const data = await this.surveyRepository.findOne({
where: {
assign_id,
},
});
return new HttpSuccess({ data: data, assignId: assign_id });
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
}
/**
* API
*
* @summary
*
*/
@Post("")
async PostSurvey(@Query() assign_id: string, @Body() requestBody: any, @Request() request: RequestWithUser) {
const personalId = await new CallAPI().GetData(request, "/org/profile/keycloak").catch(error => {
console.error("Error calling API:", error)
})
/**
* API
*
* @summary
*
*/
@Post("")
async PostSurvey(
@Query() assign_id: string,
@Body() requestBody: any,
@Request() request: RequestWithUser
) {
try {
const personalId = await new CallAPI().GetData(
request,
"/org/profile/keycloak"
);
const before = null
const data = await {
...requestBody,
personal_id: personalId,
assign_id,
createdUserId: request.user.sub,
updateUserId: request.user.sub,
}
await this.surveyRepository.save(data, { data: request })
setLogDataDiff(request, { before, after: data })
const before = null;
const data = await {
...requestBody,
personal_id: personalId,
assign_id,
createdUserId: request.user.sub,
updateUserId: request.user.sub,
};
await this.surveyRepository.save(data, { data: request });
setLogDataDiff(request, { before, after: data });
return new HttpSuccess()
}
return new HttpSuccess();
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
}
/**
* API Admin
*
* @summary Admin
*
*/
@Get("/admin")
async GetSurveyAdmin(
@Query() year: number = new Date().getFullYear(),
@Query() keyword: string = "",
@Query("page") page: number = 1,
@Query("pageSize") pageSize: number = 10,
@Request() request: RequestWithUser
) {
// await new permission().PermissionUpdate(request, "SYS_PROBATION");
const start = new Date("01-01-" + year)
const end = new Date("12-31-" + year)
/**
* API Admin
*
* @summary Admin
*
*/
@Get("/admin")
async GetSurveyAdmin(
@Query() year: number = new Date().getFullYear(),
@Query() keyword: string = "",
@Query("page") page: number = 1,
@Query("pageSize") pageSize: number = 10,
@Request() request: RequestWithUser
) {
try {
const start = new Date("01-01-" + year);
const end = new Date("12-31-" + year);
const searchKeyword = await (keyword ? keyword.trim() : null)
const searchKeyword = await (keyword ? keyword.trim() : null);
const [lists, total] = await AppDataSource.getRepository(Survey)
.createQueryBuilder("survey")
.leftJoinAndSelect("survey.personal", "personal")
.where(`survey.createdAt BETWEEN '${start.toISOString()}' AND '${end.toISOString()}'`)
.andWhere(
new Brackets(qb => {
qb.orWhere(searchKeyword ? `CONCAT(personal.prefixName, personal.firstName," ",personal.lastName) like '%${keyword}%'` : "1=1", {
keyword: `%${searchKeyword}%`,
})
qb.orWhere(searchKeyword ? `CONCAT(personal.positionName, personal.positionLevelName) like '%${keyword}%'` : "1=1", {
keyword: `%${searchKeyword}%`,
})
})
)
.orderBy("survey.createdAt", "DESC")
.skip((page - 1) * pageSize)
.take(pageSize)
.getManyAndCount()
const [lists, total] = await AppDataSource.getRepository(Survey)
.createQueryBuilder("survey")
.leftJoinAndSelect("survey.personal", "personal")
.where(
`survey.createdAt BETWEEN '${start.toISOString()}' AND '${end.toISOString()}'`
)
.andWhere(
new Brackets((qb) => {
qb.orWhere(
searchKeyword
? `CONCAT(personal.prefixName, personal.firstName," ",personal.lastName) like '%${keyword}%'`
: "1=1",
{
keyword: `%${searchKeyword}%`,
}
);
qb.orWhere(
searchKeyword
? `CONCAT(personal.positionName, personal.positionLevelName) like '%${keyword}%'`
: "1=1",
{
keyword: `%${searchKeyword}%`,
}
);
})
)
.orderBy("survey.createdAt", "DESC")
.skip((page - 1) * pageSize)
.take(pageSize)
.getManyAndCount();
const data = lists.map(item => {
return {
createdAt: item.createdAt,
personal_id: item.personal_id,
assign_id: item.assign_id,
answer1: item.answer1,
answer2: item.answer2,
answer3: item.answer3,
fullname: item.personal ? `${item.personal.prefixName}${item.personal.firstName} ${item.personal.lastName}` : "",
position: item.personal ? `${item.personal.positionName}${item.personal.positionLevelName}` : "",
}
})
const data = lists.map((item) => {
return {
createdAt: item.createdAt,
personal_id: item.personal_id,
assign_id: item.assign_id,
answer1: item.answer1,
answer2: item.answer2,
answer3: item.answer3,
fullname: item.personal
? `${item.personal.prefixName}${item.personal.firstName} ${item.personal.lastName}`
: "",
position: item.personal
? `${item.personal.positionName}${item.personal.positionLevelName}`
: "",
};
});
return new HttpSuccess({ data, total: total })
}
return new HttpSuccess({ data, total: total });
} catch (error: any) {
if (error instanceof HttpError) {
throw error;
} else throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, error.message);
}
// await new permission().PermissionUpdate(request, "SYS_PROBATION");
}
}

View file

@ -62,6 +62,7 @@ export const AppDataSource = new DataSource({
password: process.env.DB_PASSWORD,
connectorPackage: "mysql2",
synchronize: false,
timezone: "Z", // "Z" = UTC
logging: ["query", "error"],
entities:
process.env.NODE_ENV !== "production"

View file

@ -1,230 +1,247 @@
import { Entity, Column, PrimaryGeneratedColumn, OneToOne, JoinColumn, OneToMany } from "typeorm"
import { EntityBase } from "./base/Base"
import { Assign } from "./Assign"
import { Appoint } from "./Appoint"
import { Survey } from "./Survey"
import { Entity, Column, PrimaryGeneratedColumn, OneToOne, JoinColumn, OneToMany } from "typeorm";
import { EntityBase } from "./base/Base";
import { Assign } from "./Assign";
import { Appoint } from "./Appoint";
import { Survey } from "./Survey";
@Entity("personal")
export class Personal extends EntityBase {
@PrimaryGeneratedColumn("uuid")
personal_id: string
@PrimaryGeneratedColumn("uuid")
personal_id: string;
@Column({
nullable: true,
comment: "เลขที่คำสั่งบรรจุ",
})
order_number!: string
@Column({
nullable: true,
comment: "เลขที่คำสั่งบรรจุ",
})
order_number!: string;
@Column({
nullable: false,
comment:
"1 อยู่ระหว่างการทดลองปฏิบัติหน้าที่ราชการ, 2 พ้นการทดลองปฏิบัติหน้าที่ราชการ, 3 ไม่พ้นการทดลองปฏิบัติหน้าที่ราชการ, 4 ยุติการทดลองปฏิบัติหน้าที่ราชการเนื่องจากเปลี่ยนตำแหน่ง, 5 ยุติการทดลองปฏิบัติหน้าที่ราชการเนื่องจากลาออก, 6 ยุติการทดลองปฏิบัติหน้าที่ราชการเนื่องจากถึงแก่กรรม, 7 ขยายระยะเวลาทดลองปฏิบัติหน้าที่ราชการ, 8 ดึงรายชื่อไปออกคำสั่งแล้ว",
default: 1,
})
probation_status: number
@Column({
nullable: false,
comment:
"1 อยู่ระหว่างการทดลองปฏิบัติหน้าที่ราชการ, 2 พ้นการทดลองปฏิบัติหน้าที่ราชการ, 3 ไม่พ้นการทดลองปฏิบัติหน้าที่ราชการ, 4 ยุติการทดลองปฏิบัติหน้าที่ราชการเนื่องจากเปลี่ยนตำแหน่ง, 5 ยุติการทดลองปฏิบัติหน้าที่ราชการเนื่องจากลาออก, 6 ยุติการทดลองปฏิบัติหน้าที่ราชการเนื่องจากถึงแก่กรรม, 7 ขยายระยะเวลาทดลองปฏิบัติหน้าที่ราชการ, 8 ดึงรายชื่อไปออกคำสั่งแล้ว",
default: 1,
})
probation_status: number;
@Column({
nullable: false,
comment: "สถานะการใช้งาน 1 คือใช้งานปกติ, 0 คือไม่ใช้งาน",
default: 1,
})
active: number
@Column({
nullable: false,
comment: "สถานะการใช้งาน 1 คือใช้งานปกติ, 0 คือไม่ใช้งาน",
default: 1,
})
active: number;
@Column({
nullable: true,
comment: "คำนำหน้าชื่อ",
})
prefixName: string
@Column({
nullable: true,
comment: "คำนำหน้าชื่อ",
})
prefixName: string;
@Column({
nullable: false,
comment: "ชื่อ",
})
firstName: string
@Column({
nullable: false,
comment: "ชื่อ",
})
firstName: string;
@Column({
nullable: false,
comment: "นามสกุล",
})
lastName: string
@Column({
nullable: false,
comment: "นามสกุล",
})
lastName: string;
@Column({
type: Boolean,
comment: "สถานะการทดลองงาน 1 คืออยู่ระหว่างการทดลองงาน, 0 คือไม่อยู่ระหว่างการทดลองงาน",
default: 0,
})
isProbation: number
@Column({
type: Boolean,
comment: "สถานะการทดลองงาน 1 คืออยู่ระหว่างการทดลองงาน, 0 คือไม่อยู่ระหว่างการทดลองงาน",
default: 0,
})
isProbation: number;
@Column({
nullable: true,
comment: "ตำแหน่งในสายงาน",
})
positionName: string
@Column({
nullable: true,
comment: "ตำแหน่งในสายงาน",
})
positionName: string;
@Column({
nullable: true,
comment: "เลขที่ตำแหน่ง",
})
posNo: string
@Column({
nullable: true,
comment: "เลขที่ตำแหน่ง",
})
posNo: string;
@Column({
nullable: true,
comment: "ระดับตำแหน่ง",
})
positionLevelName: string
@Column({
nullable: true,
comment: "ระดับตำแหน่ง",
})
positionLevelName: string;
@Column({
nullable: true,
comment: "ด้าน/สาขา",
})
positionLineName: string
@Column({
nullable: true,
comment: "ด้าน/สาขา",
})
positionLineName: string;
@Column({
nullable: true,
comment: "ประเภทตำแหน่ง",
})
positionTypeName: string
@Column({
nullable: true,
comment: "ประเภทตำแหน่ง",
})
positionTypeName: string;
@Column({
nullable: true,
comment: "หน่วยงาน",
})
orgRootName: string
@Column({
nullable: true,
comment: "หน่วยงาน",
})
orgRootName: string;
@Column({
nullable: true,
comment: "สังกัด",
})
organization: string
@Column({
nullable: true,
comment: "สังกัด",
})
organization: string;
@Column({
nullable: true,
comment: "เลขบัตรประจำตัวประชาชน",
})
idcard: string
@Column({
nullable: true,
comment: "เลขบัตรประจำตัวประชาชน",
})
idcard: string;
@Column({ nullable: true, comment: "id หน่วยงาน root", default: null })
root: string
@Column({ nullable: true, comment: "id หน่วยงาน root", default: null })
root: string;
@Column({ nullable: true, comment: "id หน่วยงาน child1", default: null })
child1: string
@Column({ nullable: true, comment: "id หน่วยงาน child1", default: null })
child1: string;
@Column({ nullable: true, comment: "id หน่วยงาน child2", default: null })
child2: string
@Column({ nullable: true, comment: "id หน่วยงาน child2", default: null })
child2: string;
@Column({ nullable: true, comment: "id หน่วยงาน child3", default: null })
child3: string
@Column({ nullable: true, comment: "id หน่วยงาน child3", default: null })
child3: string;
@Column({ nullable: true, comment: "id หน่วยงาน child4", default: null })
child4: string
@Column({ nullable: true, comment: "id หน่วยงาน child4", default: null })
child4: string;
@Column({ nullable: true, comment: "id หน่วยงาน root", default: null })
rootDna: string
@Column({ nullable: true, comment: "id หน่วยงาน root", default: null })
rootDna: string;
@Column({ nullable: true, comment: "id หน่วยงาน child1", default: null })
child1Dna: string
@Column({ nullable: true, comment: "id หน่วยงาน child1", default: null })
child1Dna: string;
@Column({ nullable: true, comment: "id หน่วยงาน child2", default: null })
child2Dna: string
@Column({ nullable: true, comment: "id หน่วยงาน child2", default: null })
child2Dna: string;
@Column({ nullable: true, comment: "id หน่วยงาน child3", default: null })
child3Dna: string
@Column({ nullable: true, comment: "id หน่วยงาน child3", default: null })
child3Dna: string;
@Column({ nullable: true, comment: "id หน่วยงาน child4", default: null })
child4Dna: string
@Column({ nullable: true, comment: "id หน่วยงาน child4", default: null })
child4Dna: string;
@OneToMany(() => Assign, (assign: Assign) => assign.personal_id)
@JoinColumn({ name: "id" })
assign: Assign[]
@Column({ nullable: true, comment: "ชื่อ หน่วยงาน child1", default: null })
orgChild1Name: string;
@OneToOne(() => Appoint, appoint => appoint.personal)
@JoinColumn()
appoint: Appoint
@Column({ nullable: true, comment: "ชื่อ หน่วยงาน child2", default: null })
orgChild2Name: string;
@OneToOne(() => Survey, { nullable: true })
survey: Survey | null
@Column({ nullable: true, comment: "ชื่อ หน่วยงาน child3", default: null })
orgChild3Name: string;
@Column({ nullable: true, comment: "ชื่อ หน่วยงาน child4", default: null })
orgChild4Name: string;
@OneToMany(() => Assign, (assign: Assign) => assign.personal_id)
@JoinColumn({ name: "id" })
assign: Assign[];
@OneToOne(() => Appoint, (appoint) => appoint.personal)
@JoinColumn()
appoint: Appoint;
@OneToOne(() => Survey, { nullable: true })
survey: Survey | null;
}
export class CreatePersonal {
@Column()
personal_id: string
@Column()
order_number: string
@Column()
probation_status: number
// @Column()
// profiles: PersonalProfile;
@Column()
createdUserId: string
@Column()
createdFullName: string
@Column()
updateUserId: string
@Column()
updateFullName: string
@Column()
prefixName: string
@Column()
firstName: string
@Column()
lastName: string
@Column()
isProbation: number
@Column()
positionName: string
@Column()
posNo: string
@Column()
positionLevelName: string
@Column()
positionTypeName: string
@Column()
positionLineName: string
@Column()
orgRootName: string
@Column()
organization: string
@Column()
idcard: string
@Column()
personal_id: string;
@Column()
order_number: string;
@Column()
probation_status: number;
// @Column()
// profiles: PersonalProfile;
@Column()
createdUserId: string;
@Column()
createdFullName: string;
@Column()
updateUserId: string;
@Column()
updateFullName: string;
@Column()
prefixName: string;
@Column()
firstName: string;
@Column()
lastName: string;
@Column()
isProbation: number;
@Column()
positionName: string;
@Column()
posNo: string;
@Column()
positionLevelName: string;
@Column()
positionTypeName: string;
@Column()
positionLineName: string;
@Column()
orgRootName: string;
@Column()
organization: string;
@Column()
idcard: string;
}
export class PostPersonal {
id: string
prefix: string
firstName: string
lastName: string
isProbation: boolean
posTypeName?: string | null
posLevelName: string | null
position: string | null
posLineName?: string | null
posNo?: string | null
organization?: string
orgRootName: string | null
orgChild1Name?: string | null
orgChild2Name?: string | null
orgChild3Name?: string | null
orgChild4Name?: string | null
id: string;
prefix: string;
firstName: string;
lastName: string;
isProbation: boolean;
posTypeName?: string | null;
posLevelName: string | null;
position: string | null;
posLineName?: string | null;
posNo?: string | null;
organization?: string;
orgRootName: string | null;
orgChild1Name?: string | null;
orgChild2Name?: string | null;
orgChild3Name?: string | null;
orgChild4Name?: string | null;
order_number?: string
rank?: string | null
idcard?: string
positionField?: string | null
positionArea?: string | null
posExecutiveName?: string | null
positionExecutiveField?: string | null
order_number?: string;
rank?: string | null;
idcard?: string;
positionField?: string | null;
positionArea?: string | null;
posExecutiveName?: string | null;
positionExecutiveField?: string | null;
root?: string | null
child1?: string | null
child2?: string | null
child3?: string | null
child4?: string | null
root?: string | null;
child1?: string | null;
child2?: string | null;
child3?: string | null;
child4?: string | null;
rootDna?: string | null
child1Dna?: string | null
child2Dna?: string | null
child3Dna?: string | null
child4Dna?: string | null
rootDna?: string | null;
child1Dna?: string | null;
child2Dna?: string | null;
child3Dna?: string | null;
child4Dna?: string | null;
orgChild1Dna?: string | null;
orgChild2Dna?: string | null;
orgChild3Dna?: string | null;
orgChild4Dna?: string | null;
}
export type UpdatePersonal = Partial<CreatePersonal>
export type UpdatePersonal = Partial<CreatePersonal>;

View file

@ -19,10 +19,20 @@ export type LogSequence = {
};
export function setLogDataDiff(req: RequestWithUser, data: DataDiff) {
req.app.locals.logData.dataDiff = {
before: JSON.stringify(data.before),
after: JSON.stringify(data.after),
};
// Check if data.before and data.after are valid objects
if (
data.before &&
typeof data.before === "object" &&
data.after &&
typeof data.after === "object"
) {
req.app.locals.logData.dataDiff = {
before: JSON.stringify(data.before),
after: JSON.stringify(data.after),
};
} else {
console.error("Invalid data provided: both before and after must be valid objects.");
}
}
export function addLogSequence(req: RequestWithUser, data: LogSequence) {

View file

@ -0,0 +1,20 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class PersonalAddChildName1749186876022 implements MigrationInterface {
name = 'PersonalAddChildName1749186876022'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`personal\` ADD \`orgChild1Name\` varchar(255) NULL COMMENT 'ชื่อ หน่วยงาน child1'`);
await queryRunner.query(`ALTER TABLE \`personal\` ADD \`orgChild2Name\` varchar(255) NULL COMMENT 'ชื่อ หน่วยงาน child2'`);
await queryRunner.query(`ALTER TABLE \`personal\` ADD \`orgChild3Name\` varchar(255) NULL COMMENT 'ชื่อ หน่วยงาน child3'`);
await queryRunner.query(`ALTER TABLE \`personal\` ADD \`orgChild4Name\` varchar(255) NULL COMMENT 'ชื่อ หน่วยงาน child4'`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`personal\` DROP COLUMN \`orgChild4Name\``);
await queryRunner.query(`ALTER TABLE \`personal\` DROP COLUMN \`orgChild3Name\``);
await queryRunner.query(`ALTER TABLE \`personal\` DROP COLUMN \`orgChild2Name\``);
await queryRunner.query(`ALTER TABLE \`personal\` DROP COLUMN \`orgChild1Name\``);
}
}