error taos
This commit is contained in:
DESKTOP-2S5P7D1\Windows 10
parent
318839c1e9
commit
181f351860
12 changed files with 2553 additions and 3182 deletions
928
package-lock.json
generated
928
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,172 +1,150 @@
|
||||||
import {
|
import { Controller, Route, Security, Tags, Body, Request, SuccessResponse, Response, Get, Put, Post, Path, Delete } from "tsoa"
|
||||||
Controller,
|
import { setLogDataDiff } from "../interfaces/utils"
|
||||||
Route,
|
|
||||||
Security,
|
|
||||||
Tags,
|
|
||||||
Body,
|
|
||||||
Request,
|
|
||||||
SuccessResponse,
|
|
||||||
Response,
|
|
||||||
Get,
|
|
||||||
Put,
|
|
||||||
Post,
|
|
||||||
Path,
|
|
||||||
Delete,
|
|
||||||
} from "tsoa";
|
|
||||||
import { setLogDataDiff } from "../interfaces/utils";
|
|
||||||
|
|
||||||
import { AppDataSource } from "../database/data-source";
|
import { AppDataSource } from "../database/data-source"
|
||||||
import HttpSuccess from "../interfaces/http-success";
|
import HttpSuccess from "../interfaces/http-success"
|
||||||
import HttpStatusCode from "../interfaces/http-status";
|
import HttpStatusCode from "../interfaces/http-status"
|
||||||
import HttpError from "../interfaces/http-error";
|
import HttpError from "../interfaces/http-error"
|
||||||
import permission from "../interfaces/permission";
|
import permission from "../interfaces/permission"
|
||||||
import { RequestWithUser } from "../middlewares/user";
|
import { RequestWithUser } from "../middlewares/user"
|
||||||
import { Appoint, CreateAppoint, Person, UpdateAppoint } from "../entities/Appoint";
|
import { Appoint, CreateAppoint, Person, UpdateAppoint } from "../entities/Appoint"
|
||||||
import { AppointDirector } from "../entities/AppointDirector";
|
import { AppointDirector } from "../entities/AppointDirector"
|
||||||
|
|
||||||
@Route("api/v1/probation/appoint")
|
@Route("api/v1/probation/appoint")
|
||||||
@Tags("Appoint Director")
|
@Tags("Appoint Director")
|
||||||
@Security("bearerAuth")
|
@Security("bearerAuth")
|
||||||
@Response(
|
@Response(HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง")
|
||||||
HttpStatusCode.INTERNAL_SERVER_ERROR,
|
|
||||||
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง",
|
|
||||||
)
|
|
||||||
@SuccessResponse(HttpStatusCode.OK, "สำเร็จ")
|
|
||||||
export class AppointController extends Controller {
|
export class AppointController extends Controller {
|
||||||
private appointRepository = AppDataSource.getRepository(Appoint);
|
private appointRepository = AppDataSource.getRepository(Appoint)
|
||||||
private appointDirectorRepository = AppDataSource.getRepository(AppointDirector);
|
private appointDirectorRepository = AppDataSource.getRepository(AppointDirector)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API รายการแต่งตั้งคณะกรรมการฯ ทดลองงาน
|
* API รายการแต่งตั้งคณะกรรมการฯ ทดลองงาน
|
||||||
*
|
*
|
||||||
* @summary รายการแต่งตั้งคณะกรรมการฯ
|
* @summary รายการแต่งตั้งคณะกรรมการฯ
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Get("")
|
@Get("")
|
||||||
async GetList(@Request() request: RequestWithUser) {
|
async GetList(@Request() request: RequestWithUser) {
|
||||||
await new permission().PermissionList(request, "SYS_PROBATION");
|
await new permission().PermissionList(request, "SYS_PROBATION")
|
||||||
|
|
||||||
const appoint = await this.appointRepository.find({});
|
const appoint = await this.appointRepository.find({})
|
||||||
|
|
||||||
return new HttpSuccess(appoint);
|
return new HttpSuccess(appoint)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API รายการแต่งตั้งคณะกรรมการฯ ที่ออกคำสั่งแล้วทดลองงาน
|
* API รายการแต่งตั้งคณะกรรมการฯ ที่ออกคำสั่งแล้วทดลองงาน
|
||||||
*
|
*
|
||||||
* @summary รายการแต่งตั้งคณะกรรมการฯ ที่ออกคำสั่งแล้ว
|
* @summary รายการแต่งตั้งคณะกรรมการฯ ที่ออกคำสั่งแล้ว
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Get("list/{id}")
|
@Get("list/{id}")
|
||||||
async GetListCommand(@Request() request: RequestWithUser, @Path() id: string) {
|
async GetListCommand(@Request() request: RequestWithUser, @Path() id: string) {
|
||||||
const appoint = await this.appointRepository.find({
|
const appoint = await this.appointRepository.find({
|
||||||
relations: ["directors"],
|
relations: ["directors"],
|
||||||
where: { profileId: id, status: "DONE" },
|
where: { profileId: id, status: "DONE" },
|
||||||
});
|
})
|
||||||
|
|
||||||
return new HttpSuccess(appoint);
|
return new HttpSuccess(appoint)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API สร้างการแต่งตั้งคณะกรรมการฯ ทดลองงาน
|
* API สร้างการแต่งตั้งคณะกรรมการฯ ทดลองงาน
|
||||||
*
|
*
|
||||||
* @summary สร้างการแต่งตั้งคณะกรรมการฯ
|
* @summary สร้างการแต่งตั้งคณะกรรมการฯ
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Post("")
|
@Post("")
|
||||||
async Create(@Request() request: RequestWithUser, @Body() requestBody: CreateAppoint) {
|
async Create(@Request() request: RequestWithUser, @Body() requestBody: CreateAppoint) {
|
||||||
await new permission().PermissionCreate(request, "SYS_PROBATION");
|
await new permission().PermissionCreate(request, "SYS_PROBATION")
|
||||||
|
|
||||||
const data: any = {
|
const data: any = {
|
||||||
topic: requestBody.topic,
|
topic: requestBody.topic,
|
||||||
profileId: requestBody.profileId,
|
profileId: requestBody.profileId,
|
||||||
createdUserId: request.user.sub,
|
createdUserId: request.user.sub,
|
||||||
createdFullName: request.user.name,
|
createdFullName: request.user.name,
|
||||||
};
|
}
|
||||||
const before = null;
|
const before = null
|
||||||
const appoint = await this.appointRepository.save(data, { data: request });
|
const appoint = await this.appointRepository.save(data, { data: request })
|
||||||
setLogDataDiff(request, { before, after: appoint });
|
setLogDataDiff(request, { before, after: appoint })
|
||||||
|
|
||||||
return new HttpSuccess(appoint.id);
|
return new HttpSuccess(appoint.id)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API ดึงข้อมูลแต่งตั้งคณะกรรมการฯ
|
* API ดึงข้อมูลแต่งตั้งคณะกรรมการฯ
|
||||||
*
|
*
|
||||||
* @summary API ดึงข้อมูลแต่งตั้งคณะกรรมการฯ ตาม id
|
* @summary API ดึงข้อมูลแต่งตั้งคณะกรรมการฯ ตาม id
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Get("{id}")
|
@Get("{id}")
|
||||||
async GetById(@Request() request: RequestWithUser, @Path() id: string) {
|
async GetById(@Request() request: RequestWithUser, @Path() id: string) {
|
||||||
await new permission().PermissionGet(request, "SYS_PROBATION");
|
await new permission().PermissionGet(request, "SYS_PROBATION")
|
||||||
|
|
||||||
const appoint = await this.appointRepository.findOne({
|
const appoint = await this.appointRepository.findOne({
|
||||||
select: ["id", "topic", "status", "profileId"],
|
select: ["id", "topic", "status", "profileId"],
|
||||||
where: { id },
|
where: { id },
|
||||||
relations: ["directors"],
|
relations: ["directors"],
|
||||||
});
|
})
|
||||||
|
|
||||||
return new HttpSuccess(appoint);
|
return new HttpSuccess(appoint)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API แก้ไขการแต่งตั้งคณะกรรมการฯ ทดลองงาน
|
* API แก้ไขการแต่งตั้งคณะกรรมการฯ ทดลองงาน
|
||||||
*
|
*
|
||||||
* @summary แก้ไขการแต่งตั้งคณะกรรมการฯ
|
* @summary แก้ไขการแต่งตั้งคณะกรรมการฯ
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Put("{id}")
|
@Put("{id}")
|
||||||
async Update(
|
async Update(@Request() request: RequestWithUser, @Body() requestBody: UpdateAppoint, @Path() id: string) {
|
||||||
@Request() request: RequestWithUser,
|
await new permission().PermissionUpdate(request, "SYS_PROBATION")
|
||||||
@Body() requestBody: UpdateAppoint,
|
|
||||||
@Path() id: string,
|
|
||||||
) {
|
|
||||||
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) {
|
if (!appoint) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการแต่งตั้งคณะกรรมการฯ");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการแต่งตั้งคณะกรรมการฯ")
|
||||||
}
|
}
|
||||||
|
|
||||||
const before = appoint;
|
const before = appoint
|
||||||
|
|
||||||
appoint.topic = requestBody.topic;
|
appoint.topic = requestBody.topic
|
||||||
appoint.updateUserId = request.user.sub;
|
appoint.updateUserId = request.user.sub
|
||||||
appoint.updateFullName = request.user.name;
|
appoint.updateFullName = request.user.name
|
||||||
|
|
||||||
await this.appointDirectorRepository.delete({ appointId: id });
|
await this.appointDirectorRepository.delete({ appointId: id })
|
||||||
const directors = await requestBody.persons.map((x: Person) => ({
|
const directors = await requestBody.persons.map((x: Person) => ({
|
||||||
...x,
|
...x,
|
||||||
appointId: id,
|
appointId: id,
|
||||||
createdUserId: request.user.sub,
|
createdUserId: request.user.sub,
|
||||||
createdFullName: request.user.name,
|
createdFullName: request.user.name,
|
||||||
updateUserId: request.user.sub,
|
updateUserId: request.user.sub,
|
||||||
updateFullName: request.user.name,
|
updateFullName: request.user.name,
|
||||||
}));
|
}))
|
||||||
await this.appointDirectorRepository.save(directors);
|
await this.appointDirectorRepository.save(directors)
|
||||||
|
|
||||||
await this.appointRepository.save(appoint, { data: request });
|
await this.appointRepository.save(appoint, { data: request })
|
||||||
setLogDataDiff(request, { before, after: appoint });
|
setLogDataDiff(request, { before, after: appoint })
|
||||||
|
|
||||||
return new HttpSuccess();
|
return new HttpSuccess()
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API ลบรายการแต่งตั้งคณะกรรมการฯ
|
* API ลบรายการแต่งตั้งคณะกรรมการฯ
|
||||||
*
|
*
|
||||||
* @summary ลบรายการแต่งตั้งคณะกรรมการฯ
|
* @summary ลบรายการแต่งตั้งคณะกรรมการฯ
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Delete("{id}")
|
@Delete("{id}")
|
||||||
public async deleteRole(@Path() id: string, @Request() request: RequestWithUser) {
|
public async deleteRole(@Path() id: string, @Request() request: RequestWithUser) {
|
||||||
await new permission().PermissionDelete(request, "SYS_PROBATION");
|
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 });
|
const result = await this.appointRepository.delete({ id })
|
||||||
if (!result) throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
|
if (!result) throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล")
|
||||||
|
|
||||||
return new HttpSuccess();
|
return new HttpSuccess()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,47 +1,32 @@
|
||||||
import {
|
import { Controller, Route, Security, Tags, Request, SuccessResponse, Response, Get, Post, Body } from "tsoa"
|
||||||
Controller,
|
import HttpSuccess from "../interfaces/http-success"
|
||||||
Route,
|
import HttpStatusCode from "../interfaces/http-status"
|
||||||
Security,
|
import { RequestWithUser } from "../middlewares/user"
|
||||||
Tags,
|
import { findEndDate } from "../interfaces/utils"
|
||||||
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";
|
|
||||||
|
|
||||||
@Route("api/v1/probation/calculate")
|
@Route("api/v1/probation/calculate")
|
||||||
@Tags("ฟอร์มมอบหมายงาน")
|
@Tags("ฟอร์มมอบหมายงาน")
|
||||||
@Security("bearerAuth")
|
@Security("bearerAuth")
|
||||||
@Response(
|
@Response(HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง")
|
||||||
HttpStatusCode.INTERNAL_SERVER_ERROR,
|
|
||||||
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง",
|
|
||||||
)
|
|
||||||
@SuccessResponse(HttpStatusCode.OK, "สำเร็จ")
|
|
||||||
export class CalculateController extends Controller {
|
export class CalculateController extends Controller {
|
||||||
/**
|
/**
|
||||||
* API คำนวนวันสิ้นสุดตามวันที่เริ่มและระยะเวลาเดือนตามที่ส่งค่ามา
|
* API คำนวนวันสิ้นสุดตามวันที่เริ่มและระยะเวลาเดือนตามที่ส่งค่ามา
|
||||||
*
|
*
|
||||||
* @summary คำนวนวันสิ้นสุดตามวันที่เริ่มและระยะเวลาเดือนตามที่ส่งค่ามา
|
* @summary คำนวนวันสิ้นสุดตามวันที่เริ่มและระยะเวลาเดือนตามที่ส่งค่ามา
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Post("assign-finish")
|
@Post("assign-finish")
|
||||||
async AssignFinish(
|
async AssignFinish(
|
||||||
@Body()
|
@Body()
|
||||||
requestBody: {
|
requestBody: {
|
||||||
month: number;
|
month: number
|
||||||
start_date: Date;
|
start_date: Date
|
||||||
},
|
},
|
||||||
@Request() request: RequestWithUser,
|
@Request() request: RequestWithUser
|
||||||
) {
|
) {
|
||||||
const { month, start_date } = requestBody;
|
const { month, start_date } = requestBody
|
||||||
const finish_date = findEndDate(month, start_date);
|
const finish_date = findEndDate(month, start_date)
|
||||||
|
|
||||||
return new HttpSuccess({ finish_date });
|
return new HttpSuccess({ finish_date })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,331 +1,307 @@
|
||||||
import {
|
import { Controller, Route, Security, Tags, Request, SuccessResponse, Response, Get, Query } from "tsoa"
|
||||||
Controller,
|
import { AppDataSource } from "../database/data-source"
|
||||||
Route,
|
import HttpSuccess from "../interfaces/http-success"
|
||||||
Security,
|
import HttpStatusCode from "../interfaces/http-status"
|
||||||
Tags,
|
import HttpError from "../interfaces/http-error"
|
||||||
Request,
|
import { RequestWithUser } from "../middlewares/user"
|
||||||
SuccessResponse,
|
import { Knowledge, TypeKnowledge } from "../entities/Knowledge"
|
||||||
Response,
|
import { Skill, TypeSkill } from "../entities/Skill"
|
||||||
Get,
|
import { MapKnowledgeSkill } from "../entities/MapKnowledgeSkill"
|
||||||
Query,
|
import { Personal } from "../entities/Personal"
|
||||||
} from "tsoa";
|
import { Law } from "../entities/Law"
|
||||||
import { AppDataSource } from "../database/data-source";
|
import { Assign } from "../entities/Assign"
|
||||||
import HttpSuccess from "../interfaces/http-success";
|
import permission from "../interfaces/permission"
|
||||||
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")
|
@Route("api/v1/probation/data-options")
|
||||||
@Tags("Data Options")
|
@Tags("Data Options")
|
||||||
@Security("bearerAuth")
|
@Security("bearerAuth")
|
||||||
@Response(
|
@Response(HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง")
|
||||||
HttpStatusCode.INTERNAL_SERVER_ERROR,
|
|
||||||
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง",
|
|
||||||
)
|
|
||||||
@SuccessResponse(HttpStatusCode.OK, "สำเร็จ")
|
|
||||||
export class DataOptionController extends Controller {
|
export class DataOptionController extends Controller {
|
||||||
private personalRepository = AppDataSource.getRepository(Personal);
|
private personalRepository = AppDataSource.getRepository(Personal)
|
||||||
private knowledgeRepository = AppDataSource.getRepository(Knowledge);
|
private knowledgeRepository = AppDataSource.getRepository(Knowledge)
|
||||||
private mapKnowledgeSkillRepository = AppDataSource.getRepository(MapKnowledgeSkill);
|
private mapKnowledgeSkillRepository = AppDataSource.getRepository(MapKnowledgeSkill)
|
||||||
private skillRepository = AppDataSource.getRepository(Skill);
|
private skillRepository = AppDataSource.getRepository(Skill)
|
||||||
private lawRepository = AppDataSource.getRepository(Law);
|
private lawRepository = AppDataSource.getRepository(Law)
|
||||||
private assignRepository = AppDataSource.getRepository(Assign);
|
private assignRepository = AppDataSource.getRepository(Assign)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API list รายการความรู้
|
* API list รายการความรู้
|
||||||
*
|
*
|
||||||
* @summary options ความรู้
|
* @summary options ความรู้
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Get("knowledge")
|
@Get("knowledge")
|
||||||
async GetKnowledge(@Query() personal_id: string) {
|
async GetKnowledge(@Query() personal_id: string) {
|
||||||
const person = await this.personalRepository.findOne({
|
const person = await this.personalRepository.findOne({
|
||||||
where: { personal_id },
|
where: { personal_id },
|
||||||
});
|
})
|
||||||
|
|
||||||
if (!person) {
|
if (!person) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล")
|
||||||
}
|
}
|
||||||
|
|
||||||
let result = await this.mapKnowledgeSkillRepository.findOne({
|
let result = await this.mapKnowledgeSkillRepository.findOne({
|
||||||
where: {
|
where: {
|
||||||
positionName: person.positionName,
|
positionName: person.positionName,
|
||||||
positionLevelName: person.positionLevelName,
|
positionLevelName: person.positionLevelName,
|
||||||
active: 1,
|
active: 1,
|
||||||
},
|
},
|
||||||
});
|
})
|
||||||
|
|
||||||
if (!result) {
|
if (!result) {
|
||||||
// ถ้าตำแหน่งไม่ตรงหาจากระดับตำแหน่งแทนเพื่อให้ฟอร์มสามารถกรอกต่อได้
|
// ถ้าตำแหน่งไม่ตรงหาจากระดับตำแหน่งแทนเพื่อให้ฟอร์มสามารถกรอกต่อได้
|
||||||
result = await this.mapKnowledgeSkillRepository.findOne({
|
result = await this.mapKnowledgeSkillRepository.findOne({
|
||||||
where: {
|
where: {
|
||||||
positionLevelName: person.positionLevelName,
|
positionLevelName: person.positionLevelName,
|
||||||
active: 1,
|
active: 1,
|
||||||
},
|
},
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!result) {
|
if (!result) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลความรู้ที่ตรงกับตำแหน่ง");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลความรู้ที่ตรงกับตำแหน่ง")
|
||||||
}
|
}
|
||||||
|
|
||||||
const knowledges = await this.knowledgeRepository.find({
|
const knowledges = await this.knowledgeRepository.find({
|
||||||
where: { type: TypeKnowledge.PERFORMANCE, active: 1 },
|
where: { type: TypeKnowledge.PERFORMANCE, active: 1 },
|
||||||
});
|
})
|
||||||
|
|
||||||
const knowledge = knowledges.map((knowledge) => ({
|
const knowledge = knowledges.map(knowledge => ({
|
||||||
id: knowledge.id,
|
id: knowledge.id,
|
||||||
title: knowledge.title,
|
title: knowledge.title,
|
||||||
description:
|
description:
|
||||||
result.knowlage_performance_level == 1
|
result.knowlage_performance_level == 1
|
||||||
? knowledge.level1
|
? knowledge.level1
|
||||||
: result.knowlage_performance_level == 2
|
: result.knowlage_performance_level == 2
|
||||||
? knowledge.level2
|
? knowledge.level2
|
||||||
: result.knowlage_performance_level == 3
|
: result.knowlage_performance_level == 3
|
||||||
? knowledge.level3
|
? knowledge.level3
|
||||||
: result.knowlage_performance_level == 4
|
: result.knowlage_performance_level == 4
|
||||||
? knowledge.level4
|
? knowledge.level4
|
||||||
: knowledge.level5,
|
: knowledge.level5,
|
||||||
level: result.knowlage_performance_level,
|
level: result.knowlage_performance_level,
|
||||||
}));
|
}))
|
||||||
|
|
||||||
return new HttpSuccess(knowledge);
|
return new HttpSuccess(knowledge)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API ข้อมูลทักษะ
|
* API ข้อมูลทักษะ
|
||||||
*
|
*
|
||||||
* @summary options ทักษะ
|
* @summary options ทักษะ
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Get("skill")
|
@Get("skill")
|
||||||
async GetSkill(@Query() personal_id: string) {
|
async GetSkill(@Query() personal_id: string) {
|
||||||
const person = await this.personalRepository.findOne({
|
const person = await this.personalRepository.findOne({
|
||||||
where: { personal_id },
|
where: { personal_id },
|
||||||
});
|
})
|
||||||
|
|
||||||
if (!person) {
|
if (!person) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล")
|
||||||
}
|
}
|
||||||
|
|
||||||
let result = await this.mapKnowledgeSkillRepository.findOne({
|
let result = await this.mapKnowledgeSkillRepository.findOne({
|
||||||
select: [
|
select: ["skill_computer_level", "skill_english_level", "skill_information_level", "skill_resourse_level"],
|
||||||
"skill_computer_level",
|
where: {
|
||||||
"skill_english_level",
|
positionName: person.positionName,
|
||||||
"skill_information_level",
|
positionLevelName: person.positionLevelName,
|
||||||
"skill_resourse_level",
|
active: 1,
|
||||||
],
|
},
|
||||||
where: {
|
})
|
||||||
positionName: person.positionName,
|
|
||||||
positionLevelName: person.positionLevelName,
|
|
||||||
active: 1,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!result) {
|
if (!result) {
|
||||||
// ถ้าตำแหน่งไม่ตรงหาจากระดับตำแหน่งแทนเพื่อให้ฟอร์มสามารถกรอกต่อได้
|
// ถ้าตำแหน่งไม่ตรงหาจากระดับตำแหน่งแทนเพื่อให้ฟอร์มสามารถกรอกต่อได้
|
||||||
result = await this.mapKnowledgeSkillRepository.findOne({
|
result = await this.mapKnowledgeSkillRepository.findOne({
|
||||||
select: [
|
select: ["skill_computer_level", "skill_english_level", "skill_information_level", "skill_resourse_level"],
|
||||||
"skill_computer_level",
|
where: {
|
||||||
"skill_english_level",
|
positionLevelName: person.positionLevelName,
|
||||||
"skill_information_level",
|
active: 1,
|
||||||
"skill_resourse_level",
|
},
|
||||||
],
|
})
|
||||||
where: {
|
}
|
||||||
positionLevelName: person.positionLevelName,
|
|
||||||
active: 1,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!result) {
|
if (!result) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทักษะที่ตรงกับตำแหน่ง");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทักษะที่ตรงกับตำแหน่ง")
|
||||||
}
|
}
|
||||||
|
|
||||||
const computerData = await this.skillRepository.findOne({
|
const computerData = await this.skillRepository.findOne({
|
||||||
where: { type: TypeSkill.COMPUTER, active: 1 },
|
where: { type: TypeSkill.COMPUTER, active: 1 },
|
||||||
});
|
})
|
||||||
|
|
||||||
if (!computerData) {
|
if (!computerData) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทักษะคอมพิวเตอร์");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทักษะคอมพิวเตอร์")
|
||||||
}
|
}
|
||||||
const computer = await {
|
const computer = await {
|
||||||
id: computerData.id,
|
id: computerData.id,
|
||||||
title: computerData.title,
|
title: computerData.title,
|
||||||
level_description:
|
level_description:
|
||||||
result.skill_computer_level == 1
|
result.skill_computer_level == 1
|
||||||
? computerData.level1
|
? computerData.level1
|
||||||
: result.skill_computer_level == 2
|
: result.skill_computer_level == 2
|
||||||
? computerData.level2
|
? computerData.level2
|
||||||
: result.skill_computer_level == 3
|
: result.skill_computer_level == 3
|
||||||
? computerData.level3
|
? computerData.level3
|
||||||
: result.skill_computer_level == 4
|
: result.skill_computer_level == 4
|
||||||
? computerData.level4
|
? computerData.level4
|
||||||
: computerData.level5,
|
: computerData.level5,
|
||||||
level: result.skill_computer_level,
|
level: result.skill_computer_level,
|
||||||
};
|
}
|
||||||
|
|
||||||
const englishData = await this.skillRepository.findOne({
|
const englishData = await this.skillRepository.findOne({
|
||||||
where: { type: TypeSkill.ENG, active: 1 },
|
where: { type: TypeSkill.ENG, active: 1 },
|
||||||
});
|
})
|
||||||
|
|
||||||
if (!englishData) {
|
if (!englishData) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทักษะภาษาอังกฤษ");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทักษะภาษาอังกฤษ")
|
||||||
}
|
}
|
||||||
|
|
||||||
const english = await {
|
const english = await {
|
||||||
id: englishData.id,
|
id: englishData.id,
|
||||||
title: englishData.title,
|
title: englishData.title,
|
||||||
level_description:
|
level_description:
|
||||||
result.skill_english_level == 1
|
result.skill_english_level == 1
|
||||||
? englishData.level1
|
? englishData.level1
|
||||||
: result.skill_english_level == 2
|
: result.skill_english_level == 2
|
||||||
? englishData.level2
|
? englishData.level2
|
||||||
: result.skill_english_level == 3
|
: result.skill_english_level == 3
|
||||||
? englishData.level3
|
? englishData.level3
|
||||||
: result.skill_english_level == 4
|
: result.skill_english_level == 4
|
||||||
? englishData.level4
|
? englishData.level4
|
||||||
: englishData.level5,
|
: englishData.level5,
|
||||||
level: result.skill_english_level,
|
level: result.skill_english_level,
|
||||||
};
|
}
|
||||||
|
|
||||||
const informationData = await this.skillRepository.findOne({
|
const informationData = await this.skillRepository.findOne({
|
||||||
where: { type: TypeSkill.INFORMATION, active: 1 },
|
where: { type: TypeSkill.INFORMATION, active: 1 },
|
||||||
});
|
})
|
||||||
|
|
||||||
if (!informationData) {
|
if (!informationData) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล")
|
||||||
}
|
}
|
||||||
|
|
||||||
const information = await {
|
const information = await {
|
||||||
id: informationData.id,
|
id: informationData.id,
|
||||||
title: informationData.title,
|
title: informationData.title,
|
||||||
level_description:
|
level_description:
|
||||||
result.skill_information_level == 1
|
result.skill_information_level == 1
|
||||||
? informationData.level1
|
? informationData.level1
|
||||||
: result.skill_information_level == 2
|
: result.skill_information_level == 2
|
||||||
? informationData.level2
|
? informationData.level2
|
||||||
: result.skill_information_level == 3
|
: result.skill_information_level == 3
|
||||||
? informationData.level3
|
? informationData.level3
|
||||||
: result.skill_information_level == 4
|
: result.skill_information_level == 4
|
||||||
? informationData.level4
|
? informationData.level4
|
||||||
: informationData.level5,
|
: informationData.level5,
|
||||||
level: result.skill_information_level,
|
level: result.skill_information_level,
|
||||||
};
|
}
|
||||||
|
|
||||||
const resourseData = await this.skillRepository.findOne({
|
const resourseData = await this.skillRepository.findOne({
|
||||||
where: { type: TypeSkill.RESOURSE, active: 1 },
|
where: { type: TypeSkill.RESOURSE, active: 1 },
|
||||||
});
|
})
|
||||||
if (!resourseData) {
|
if (!resourseData) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล")
|
||||||
}
|
}
|
||||||
|
|
||||||
const resourse = await {
|
const resourse = await {
|
||||||
id: resourseData.id,
|
id: resourseData.id,
|
||||||
title: resourseData.title,
|
title: resourseData.title,
|
||||||
level_description:
|
level_description:
|
||||||
result.skill_resourse_level == 1
|
result.skill_resourse_level == 1
|
||||||
? resourseData.level1
|
? resourseData.level1
|
||||||
: result.skill_resourse_level == 2
|
: result.skill_resourse_level == 2
|
||||||
? resourseData.level2
|
? resourseData.level2
|
||||||
: result.skill_resourse_level == 3
|
: result.skill_resourse_level == 3
|
||||||
? resourseData.level3
|
? resourseData.level3
|
||||||
: result.skill_resourse_level == 4
|
: result.skill_resourse_level == 4
|
||||||
? resourseData.level4
|
? resourseData.level4
|
||||||
: resourseData.level5,
|
: resourseData.level5,
|
||||||
level: result.skill_resourse_level,
|
level: result.skill_resourse_level,
|
||||||
};
|
}
|
||||||
|
|
||||||
return new HttpSuccess({
|
return new HttpSuccess({
|
||||||
computer,
|
computer,
|
||||||
english,
|
english,
|
||||||
information,
|
information,
|
||||||
resourse,
|
resourse,
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API list รายการกฎหมาย
|
* API list รายการกฎหมาย
|
||||||
*
|
*
|
||||||
* @summary options กฎหมาย
|
* @summary options กฎหมาย
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Get("law")
|
@Get("law")
|
||||||
async GetLaw(@Query() personal_id: string) {
|
async GetLaw(@Query() personal_id: string) {
|
||||||
const results = await this.lawRepository.find({
|
const results = await this.lawRepository.find({
|
||||||
select: ["id", "parent_id", "description", "status_select"],
|
select: ["id", "parent_id", "description", "status_select"],
|
||||||
where: {
|
where: {
|
||||||
active: 1,
|
active: 1,
|
||||||
},
|
},
|
||||||
});
|
})
|
||||||
|
|
||||||
if (!results) {
|
if (!results) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล")
|
||||||
}
|
}
|
||||||
|
|
||||||
const result = await results.map((v) => ({
|
const result = await results.map(v => ({
|
||||||
...v,
|
...v,
|
||||||
checked: 0,
|
checked: 0,
|
||||||
}));
|
}))
|
||||||
|
|
||||||
return new HttpSuccess(result);
|
return new HttpSuccess(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API ดึงข้อมูลจำนวนครั้งแบบมอบหมายงานและข้อมูลผู้ทดลอง
|
* API ดึงข้อมูลจำนวนครั้งแบบมอบหมายงานและข้อมูลผู้ทดลอง
|
||||||
*
|
*
|
||||||
* @summary จำนวนครั้งแบบมอบหมายงานและข้อมูลผู้ทดลอง
|
* @summary จำนวนครั้งแบบมอบหมายงานและข้อมูลผู้ทดลอง
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Get("new-assign")
|
@Get("new-assign")
|
||||||
async NewAssign(@Query() personal_id: string, @Request() request: RequestWithUser) {
|
async NewAssign(@Query() personal_id: string, @Request() request: RequestWithUser) {
|
||||||
await new permission().PermissionGet(request, "SYS_PROBATION");
|
await new permission().PermissionGet(request, "SYS_PROBATION")
|
||||||
|
|
||||||
const person = await this.personalRepository.findOne({
|
const person = await this.personalRepository.findOne({
|
||||||
select: [
|
select: [
|
||||||
"personal_id",
|
"personal_id",
|
||||||
"prefixName",
|
"prefixName",
|
||||||
"firstName",
|
"firstName",
|
||||||
"lastName",
|
"lastName",
|
||||||
"posNo",
|
"posNo",
|
||||||
"positionName",
|
"positionName",
|
||||||
"positionLevelName",
|
"positionLevelName",
|
||||||
"positionLineName",
|
"positionLineName",
|
||||||
"isProbation",
|
"isProbation",
|
||||||
"orgRootName",
|
"orgRootName",
|
||||||
"organization",
|
"organization",
|
||||||
"createdAt",
|
"createdAt",
|
||||||
"updatedAt",
|
"updatedAt",
|
||||||
],
|
],
|
||||||
where: { personal_id },
|
where: { personal_id },
|
||||||
});
|
})
|
||||||
|
|
||||||
if (!person) {
|
if (!person) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล")
|
||||||
}
|
}
|
||||||
|
|
||||||
const assign = await this.assignRepository.count({
|
const assign = await this.assignRepository.count({
|
||||||
where: {
|
where: {
|
||||||
personal_id,
|
personal_id,
|
||||||
},
|
},
|
||||||
});
|
})
|
||||||
|
|
||||||
const responsePerson = {
|
const responsePerson = {
|
||||||
id: person.personal_id,
|
id: person.personal_id,
|
||||||
...person,
|
...person,
|
||||||
};
|
}
|
||||||
|
|
||||||
return new HttpSuccess({
|
return new HttpSuccess({
|
||||||
person: responsePerson,
|
person: responsePerson,
|
||||||
assign_no: assign + 1,
|
assign_no: assign + 1,
|
||||||
assign_month: 6,
|
assign_month: 6,
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,496 +1,428 @@
|
||||||
import {
|
import { Controller, Route, Security, Tags, Request, SuccessResponse, Response, Get, Post, Body, Query, Put } from "tsoa"
|
||||||
Controller,
|
import HttpSuccess from "../interfaces/http-success"
|
||||||
Route,
|
import HttpStatusCode from "../interfaces/http-status"
|
||||||
Security,
|
import { RequestWithUser } from "../middlewares/user"
|
||||||
Tags,
|
import { findEndDate, setLogDataDiff } from "../interfaces/utils"
|
||||||
Request,
|
import { AppDataSource } from "../database/data-source"
|
||||||
SuccessResponse,
|
import { AssignDirector } from "../entities/AssignDirector"
|
||||||
Response,
|
import HttpError from "../interfaces/http-error"
|
||||||
Get,
|
import { Assign } from "../entities/Assign"
|
||||||
Post,
|
import { Personal } from "../entities/Personal"
|
||||||
Body,
|
import CallAPI from "../interfaces/call-api"
|
||||||
Query,
|
import { CreateEvaluateChairman, EvaluateChairman } from "../entities/EvaluateChairman"
|
||||||
Put,
|
import permission from "../interfaces/permission"
|
||||||
} 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 { Personal } from "../entities/Personal";
|
|
||||||
import CallAPI from "../interfaces/call-api";
|
|
||||||
import { CreateEvaluateChairman, EvaluateChairman } from "../entities/EvaluateChairman";
|
|
||||||
import permission from "../interfaces/permission";
|
|
||||||
@Route("api/v1/probation/evaluate-chairman")
|
@Route("api/v1/probation/evaluate-chairman")
|
||||||
@Tags("แบบประเมินผล (คณะกรรมการ)")
|
@Tags("แบบประเมินผล (คณะกรรมการ)")
|
||||||
@Security("bearerAuth")
|
@Security("bearerAuth")
|
||||||
@Response(
|
@Response(HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง")
|
||||||
HttpStatusCode.INTERNAL_SERVER_ERROR,
|
|
||||||
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง",
|
|
||||||
)
|
|
||||||
@SuccessResponse(HttpStatusCode.OK, "สำเร็จ")
|
|
||||||
export class EvaluateChairmanController extends Controller {
|
export class EvaluateChairmanController extends Controller {
|
||||||
private assignDirectorRepository = AppDataSource.getRepository(AssignDirector);
|
private assignDirectorRepository = AppDataSource.getRepository(AssignDirector)
|
||||||
private assignRepository = AppDataSource.getRepository(Assign);
|
private assignRepository = AppDataSource.getRepository(Assign)
|
||||||
private evaluateChairmanRepository = AppDataSource.getRepository(EvaluateChairman);
|
private evaluateChairmanRepository = AppDataSource.getRepository(EvaluateChairman)
|
||||||
private personalRepository = AppDataSource.getRepository(Personal);
|
private personalRepository = AppDataSource.getRepository(Personal)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API ข้อมูลตอนกดสร้างแบบประเมินผล (คณะกรรมการ)
|
* API ข้อมูลตอนกดสร้างแบบประเมินผล (คณะกรรมการ)
|
||||||
*
|
*
|
||||||
* @summary ข้อมูลตอนกดสร้างแบบประเมินผล (คณะกรรมการ)
|
* @summary ข้อมูลตอนกดสร้างแบบประเมินผล (คณะกรรมการ)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Get("create")
|
@Get("create")
|
||||||
async CreateEvaluate(@Query() assign_id: string, @Request() request: RequestWithUser) {
|
async CreateEvaluate(@Query() assign_id: string, @Request() request: RequestWithUser) {
|
||||||
await new permission().PermissionGet(request, "SYS_PROBATION");
|
await new permission().PermissionGet(request, "SYS_PROBATION")
|
||||||
|
|
||||||
const director = await this.assignDirectorRepository.findOne({
|
const director = await this.assignDirectorRepository.findOne({
|
||||||
select: ["personal_id"],
|
select: ["personal_id"],
|
||||||
where: {
|
where: {
|
||||||
assign_id,
|
assign_id,
|
||||||
role: "chairman",
|
role: "chairman",
|
||||||
},
|
},
|
||||||
});
|
})
|
||||||
if (!director) {
|
if (!director) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล")
|
||||||
}
|
}
|
||||||
const director_id = director.personal_id;
|
const director_id = director.personal_id
|
||||||
|
|
||||||
const assign = await this.assignRepository.findOne({
|
const assign = await this.assignRepository.findOne({
|
||||||
relations: ["profile"],
|
relations: ["profile"],
|
||||||
where: { id: assign_id },
|
where: { id: assign_id },
|
||||||
});
|
})
|
||||||
if (!assign) {
|
if (!assign) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน")
|
||||||
}
|
}
|
||||||
|
|
||||||
const profile = await (assign.profile
|
const profile = await (assign.profile
|
||||||
? {
|
? {
|
||||||
...assign.profile,
|
...assign.profile,
|
||||||
id: assign.profile.personal_id,
|
id: assign.profile.personal_id,
|
||||||
name:
|
name: assign.profile.prefixName + assign.profile.firstName + " " + assign.profile.lastName,
|
||||||
assign.profile.prefixName + assign.profile.firstName + " " + assign.profile.lastName,
|
Oc: assign.profile.organization,
|
||||||
Oc: assign.profile.organization,
|
}
|
||||||
}
|
: null)
|
||||||
: null);
|
|
||||||
|
|
||||||
const evaluate_amount = await this.evaluateChairmanRepository.count({
|
const evaluate_amount = await this.evaluateChairmanRepository.count({
|
||||||
where: {
|
where: {
|
||||||
assign_id,
|
assign_id,
|
||||||
director_id,
|
director_id,
|
||||||
},
|
},
|
||||||
});
|
})
|
||||||
const evaluate_no = await (evaluate_amount + 1);
|
const evaluate_no = await (evaluate_amount + 1)
|
||||||
const start_date =
|
const start_date = evaluate_amount == 0 ? assign.date_start : findEndDate(evaluate_amount * 3, assign.date_start)
|
||||||
evaluate_amount == 0
|
|
||||||
? assign.date_start
|
|
||||||
: findEndDate(evaluate_amount * 3, assign.date_start);
|
|
||||||
|
|
||||||
const directorData = await this.assignDirectorRepository.find({
|
const directorData = await this.assignDirectorRepository.find({
|
||||||
where: { assign_id },
|
where: { assign_id },
|
||||||
order: { ordering: "ASC" },
|
order: { ordering: "ASC" },
|
||||||
});
|
})
|
||||||
|
|
||||||
if (!directorData) {
|
if (!directorData) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน")
|
||||||
}
|
}
|
||||||
|
|
||||||
let mentors = [];
|
let mentors = []
|
||||||
const mentorList = await directorData.filter((x) => x.role == "mentor");
|
const mentorList = await directorData.filter(x => x.role == "mentor")
|
||||||
if (mentorList.length > 0) {
|
if (mentorList.length > 0) {
|
||||||
for (let index = 0; index < mentorList.length; index++) {
|
for (let index = 0; index < mentorList.length; index++) {
|
||||||
const e = await mentorList[index];
|
const e = await mentorList[index]
|
||||||
|
|
||||||
mentors.push({
|
mentors.push({
|
||||||
personal_id: e.personal_id,
|
personal_id: e.personal_id,
|
||||||
dated: e.dated,
|
dated: e.dated,
|
||||||
name: e.fullname,
|
name: e.fullname,
|
||||||
label:
|
label: e.fullname + " " + (e.position ? `(${e.position}, ${e.posType}: ${e.posLevel})` : ""),
|
||||||
e.fullname + " " + (e.position ? `(${e.position}, ${e.posType}: ${e.posLevel})` : ""),
|
position: e.position,
|
||||||
position: e.position,
|
posType: e.posType,
|
||||||
posType: e.posType,
|
posLevel: e.posLevel,
|
||||||
posLevel: e.posLevel,
|
})
|
||||||
});
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
const commanderData = await (directorData.find((x) => x.role == "commander") ?? null);
|
const commanderData = await (directorData.find(x => x.role == "commander") ?? null)
|
||||||
|
|
||||||
const commander =
|
const commander =
|
||||||
commanderData != null
|
commanderData != null
|
||||||
? {
|
? {
|
||||||
personal_id: commanderData.personal_id,
|
personal_id: commanderData.personal_id,
|
||||||
dated: commanderData.dated,
|
dated: commanderData.dated,
|
||||||
name: commanderData.fullname,
|
name: commanderData.fullname,
|
||||||
label:
|
label: commanderData.fullname + " " + (commanderData.position ? `(${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})` : ""),
|
||||||
commanderData.fullname +
|
position: commanderData.position,
|
||||||
" " +
|
posType: commanderData.posType,
|
||||||
(commanderData.position
|
posLevel: commanderData.posLevel,
|
||||||
? `(${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})`
|
}
|
||||||
: ""),
|
: null
|
||||||
position: commanderData.position,
|
|
||||||
posType: commanderData.posType,
|
|
||||||
posLevel: commanderData.posLevel,
|
|
||||||
}
|
|
||||||
: null;
|
|
||||||
|
|
||||||
const chairmanData = await (directorData.find((x) => x.role == "chairman") ?? null);
|
const chairmanData = await (directorData.find(x => x.role == "chairman") ?? null)
|
||||||
const chairman =
|
const chairman =
|
||||||
chairmanData != null
|
chairmanData != null
|
||||||
? {
|
? {
|
||||||
personal_id: chairmanData.personal_id,
|
personal_id: chairmanData.personal_id,
|
||||||
dated: chairmanData.dated,
|
dated: chairmanData.dated,
|
||||||
name: chairmanData.fullname,
|
name: chairmanData.fullname,
|
||||||
label:
|
label: chairmanData.fullname + " " + (chairmanData.position ? `(${chairmanData.position}, ${chairmanData.posType}: ${chairmanData.posLevel})` : ""),
|
||||||
chairmanData.fullname +
|
position: chairmanData.position,
|
||||||
" " +
|
posType: chairmanData.posType,
|
||||||
(chairmanData.position
|
posLevel: chairmanData.posLevel,
|
||||||
? `(${chairmanData.position}, ${chairmanData.posType}: ${chairmanData.posLevel})`
|
}
|
||||||
: ""),
|
: null
|
||||||
position: chairmanData.position,
|
|
||||||
posType: chairmanData.posType,
|
|
||||||
posLevel: chairmanData.posLevel,
|
|
||||||
}
|
|
||||||
: null;
|
|
||||||
|
|
||||||
return new HttpSuccess({
|
return new HttpSuccess({
|
||||||
person: profile ? profile : null,
|
person: profile ? profile : null,
|
||||||
assign,
|
assign,
|
||||||
evaluate_no: evaluate_no,
|
evaluate_no: evaluate_no,
|
||||||
start_date: start_date,
|
start_date: start_date,
|
||||||
end_date: findEndDate(3, start_date),
|
end_date: findEndDate(3, start_date),
|
||||||
commander,
|
commander,
|
||||||
mentors,
|
mentors,
|
||||||
chairman,
|
chairman,
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API ข้อมูลแบบประเมินผล (คณะกรรมการ)
|
* API ข้อมูลแบบประเมินผล (คณะกรรมการ)
|
||||||
*
|
*
|
||||||
* @summary ข้อมูลแบบประเมินผล (คณะกรรมการ)
|
* @summary ข้อมูลแบบประเมินผล (คณะกรรมการ)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Get("")
|
@Get("")
|
||||||
async GetEvaluate(
|
async GetEvaluate(@Request() request: RequestWithUser, @Query() assign_id: string, @Query() evaluate_no?: string) {
|
||||||
@Request() request: RequestWithUser,
|
await new permission().PermissionGet(request, "SYS_PROBATION")
|
||||||
@Query() assign_id: string,
|
// ต้องปรับเป็น id ของคนที่ access เข้ามา
|
||||||
@Query() evaluate_no?: string,
|
const director = await this.assignDirectorRepository.findOne({
|
||||||
) {
|
select: ["personal_id"],
|
||||||
await new permission().PermissionGet(request, "SYS_PROBATION");
|
where: {
|
||||||
// ต้องปรับเป็น id ของคนที่ access เข้ามา
|
assign_id,
|
||||||
const director = await this.assignDirectorRepository.findOne({
|
role: "chairman",
|
||||||
select: ["personal_id"],
|
},
|
||||||
where: {
|
})
|
||||||
assign_id,
|
if (!director) {
|
||||||
role: "chairman",
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล")
|
||||||
},
|
}
|
||||||
});
|
const director_id = director.personal_id
|
||||||
if (!director) {
|
let evaluate: any = null
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
|
if (evaluate_no) {
|
||||||
}
|
evaluate = await this.evaluateChairmanRepository.findOne({
|
||||||
const director_id = director.personal_id;
|
where: {
|
||||||
let evaluate: any = null;
|
director_id,
|
||||||
if (evaluate_no) {
|
assign_id,
|
||||||
evaluate = await this.evaluateChairmanRepository.findOne({
|
no: evaluate_no,
|
||||||
where: {
|
},
|
||||||
director_id,
|
})
|
||||||
assign_id,
|
} else {
|
||||||
no: evaluate_no,
|
evaluate = await this.evaluateChairmanRepository.find({
|
||||||
},
|
where: {
|
||||||
});
|
director_id,
|
||||||
} else {
|
assign_id,
|
||||||
evaluate = await this.evaluateChairmanRepository.find({
|
},
|
||||||
where: {
|
})
|
||||||
director_id,
|
|
||||||
assign_id,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (evaluate)
|
if (evaluate)
|
||||||
evaluate = await evaluate.map((element: EvaluateChairman) => ({
|
evaluate = await evaluate.map((element: EvaluateChairman) => ({
|
||||||
...element,
|
...element,
|
||||||
no: Number(element.no),
|
no: Number(element.no),
|
||||||
}));
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!evaluate) {
|
if (!evaluate) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบประเมิน");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบประเมิน")
|
||||||
}
|
}
|
||||||
|
|
||||||
const assign = await this.assignRepository.findOne({
|
const assign = await this.assignRepository.findOne({
|
||||||
where: { id: assign_id },
|
where: { id: assign_id },
|
||||||
});
|
})
|
||||||
if (!assign) {
|
if (!assign) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน")
|
||||||
}
|
}
|
||||||
|
|
||||||
const experimenteeData = await this.personalRepository.find({
|
const experimenteeData = await this.personalRepository.find({
|
||||||
select: [
|
select: ["personal_id", "prefixName", "firstName", "lastName", "positionName", "positionLevelName", "organization"],
|
||||||
"personal_id",
|
where: { personal_id: assign.personal_id },
|
||||||
"prefixName",
|
})
|
||||||
"firstName",
|
|
||||||
"lastName",
|
|
||||||
"positionName",
|
|
||||||
"positionLevelName",
|
|
||||||
"organization",
|
|
||||||
],
|
|
||||||
where: { personal_id: assign.personal_id },
|
|
||||||
});
|
|
||||||
|
|
||||||
const experimentee = await experimenteeData.map((element) => ({
|
const experimentee = await experimenteeData.map(element => ({
|
||||||
...element,
|
...element,
|
||||||
name: element.prefixName + element.firstName + " " + element.lastName,
|
name: element.prefixName + element.firstName + " " + element.lastName,
|
||||||
Oc: element.organization,
|
Oc: element.organization,
|
||||||
}));
|
}))
|
||||||
|
|
||||||
const directorData = await this.assignDirectorRepository.find({
|
const directorData = await this.assignDirectorRepository.find({
|
||||||
where: { assign_id },
|
where: { assign_id },
|
||||||
order: { ordering: "ASC" },
|
order: { ordering: "ASC" },
|
||||||
});
|
})
|
||||||
|
|
||||||
if (!directorData) {
|
if (!directorData) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน")
|
||||||
}
|
}
|
||||||
|
|
||||||
let mentors = [];
|
let mentors = []
|
||||||
const mentorList = await directorData.filter((x) => x.role == "mentor");
|
const mentorList = await directorData.filter(x => x.role == "mentor")
|
||||||
if (mentorList.length > 0) {
|
if (mentorList.length > 0) {
|
||||||
for (let index = 0; index < mentorList.length; index++) {
|
for (let index = 0; index < mentorList.length; index++) {
|
||||||
const e = await mentorList[index];
|
const e = await mentorList[index]
|
||||||
|
|
||||||
mentors.push({
|
mentors.push({
|
||||||
personal_id: e.personal_id,
|
personal_id: e.personal_id,
|
||||||
dated: e.dated,
|
dated: e.dated,
|
||||||
name: e.fullname,
|
name: e.fullname,
|
||||||
label:
|
label: e.fullname + " " + (e.position ? `(${e.position}, ${e.posType}: ${e.posLevel})` : ""),
|
||||||
e.fullname + " " + (e.position ? `(${e.position}, ${e.posType}: ${e.posLevel})` : ""),
|
position: e.position,
|
||||||
position: e.position,
|
posType: e.posType,
|
||||||
posType: e.posType,
|
posLevel: e.posLevel,
|
||||||
posLevel: e.posLevel,
|
})
|
||||||
});
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
const commanderData = await (directorData.find((x) => x.role == "commander") ?? null);
|
const commanderData = await (directorData.find(x => x.role == "commander") ?? null)
|
||||||
|
|
||||||
const commander =
|
const commander =
|
||||||
commanderData != null
|
commanderData != null
|
||||||
? {
|
? {
|
||||||
personal_id: commanderData.personal_id,
|
personal_id: commanderData.personal_id,
|
||||||
dated: commanderData.dated,
|
dated: commanderData.dated,
|
||||||
name: commanderData.fullname,
|
name: commanderData.fullname,
|
||||||
label:
|
label: commanderData.fullname + " " + (commanderData.position ? `(${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})` : ""),
|
||||||
commanderData.fullname +
|
position: commanderData.position,
|
||||||
" " +
|
posType: commanderData.posType,
|
||||||
(commanderData.position
|
posLevel: commanderData.posLevel,
|
||||||
? `(${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})`
|
}
|
||||||
: ""),
|
: null
|
||||||
position: commanderData.position,
|
|
||||||
posType: commanderData.posType,
|
|
||||||
posLevel: commanderData.posLevel,
|
|
||||||
}
|
|
||||||
: null;
|
|
||||||
|
|
||||||
const chairmanData = await (directorData.find((x) => x.role == "chairman") ?? null);
|
const chairmanData = await (directorData.find(x => x.role == "chairman") ?? null)
|
||||||
const chairman =
|
const chairman =
|
||||||
chairmanData != null
|
chairmanData != null
|
||||||
? {
|
? {
|
||||||
personal_id: chairmanData.personal_id,
|
personal_id: chairmanData.personal_id,
|
||||||
dated: chairmanData.dated,
|
dated: chairmanData.dated,
|
||||||
name: chairmanData.fullname,
|
name: chairmanData.fullname,
|
||||||
label:
|
label: chairmanData.fullname + " " + (chairmanData.position ? `(${chairmanData.position}, ${chairmanData.posType}: ${chairmanData.posLevel})` : ""),
|
||||||
chairmanData.fullname +
|
position: chairmanData.position,
|
||||||
" " +
|
posType: chairmanData.posType,
|
||||||
(chairmanData.position
|
posLevel: chairmanData.posLevel,
|
||||||
? `(${chairmanData.position}, ${chairmanData.posType}: ${chairmanData.posLevel})`
|
}
|
||||||
: ""),
|
: null
|
||||||
position: chairmanData.position,
|
|
||||||
posType: chairmanData.posType,
|
|
||||||
posLevel: chairmanData.posLevel,
|
|
||||||
}
|
|
||||||
: null;
|
|
||||||
|
|
||||||
return new HttpSuccess({
|
return new HttpSuccess({
|
||||||
experimentee: experimentee,
|
experimentee: experimentee,
|
||||||
mentors: mentors,
|
mentors: mentors,
|
||||||
commander: commander,
|
commander: commander,
|
||||||
chairman: chairman,
|
chairman: chairman,
|
||||||
assign,
|
assign,
|
||||||
evaluate,
|
evaluate,
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API บันทึกข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
|
* API บันทึกข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
|
||||||
*
|
*
|
||||||
* @summary บันทึกข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
|
* @summary บันทึกข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Post("")
|
@Post("")
|
||||||
async PostData(
|
async PostData(@Query() assign_id: string, @Body() requestBody: CreateEvaluateChairman, @Request() request: RequestWithUser) {
|
||||||
@Query() assign_id: string,
|
await new permission().PermissionUpdate(request, "SYS_PROBATION")
|
||||||
@Body() requestBody: CreateEvaluateChairman,
|
|
||||||
@Request() request: RequestWithUser,
|
|
||||||
) {
|
|
||||||
await new permission().PermissionUpdate(request, "SYS_PROBATION");
|
|
||||||
|
|
||||||
const director = await this.assignDirectorRepository.findOne({
|
const director = await this.assignDirectorRepository.findOne({
|
||||||
select: ["personal_id"],
|
select: ["personal_id"],
|
||||||
where: {
|
where: {
|
||||||
assign_id,
|
assign_id,
|
||||||
role: "chairman",
|
role: "chairman",
|
||||||
},
|
},
|
||||||
});
|
})
|
||||||
if (!director) {
|
if (!director) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล")
|
||||||
}
|
}
|
||||||
|
|
||||||
const director_id = director.personal_id;
|
const director_id = director.personal_id
|
||||||
|
|
||||||
const assign = await this.assignRepository.findOne({
|
const assign = await this.assignRepository.findOne({
|
||||||
relations: ["profile"],
|
relations: ["profile"],
|
||||||
where: { id: assign_id },
|
where: { id: assign_id },
|
||||||
});
|
})
|
||||||
if (!assign) {
|
if (!assign) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน")
|
||||||
}
|
}
|
||||||
|
|
||||||
const postData: any = await {
|
const postData: any = await {
|
||||||
assign_id,
|
assign_id,
|
||||||
...requestBody,
|
...requestBody,
|
||||||
director_id,
|
director_id,
|
||||||
no: requestBody.evaluate_no,
|
no: requestBody.evaluate_no,
|
||||||
date_start: requestBody.start_date,
|
date_start: requestBody.start_date,
|
||||||
personal_id: assign.personal_id,
|
personal_id: assign.personal_id,
|
||||||
|
|
||||||
achievement_other_desc: requestBody.achievement_other
|
achievement_other_desc: requestBody.achievement_other ? requestBody.achievement_other.text : "",
|
||||||
? requestBody.achievement_other.text
|
achievement_other_level: requestBody.achievement_other ? Number(requestBody.achievement_other.level) : 0,
|
||||||
: "",
|
behavior_other_desc: requestBody.behavior_orther.text,
|
||||||
achievement_other_level: requestBody.achievement_other
|
behavior_other_level: requestBody.behavior_orther.text != "" ? Number(requestBody.behavior_orther.level) : 0,
|
||||||
? 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,
|
createdUserId: request.user.sub,
|
||||||
createdFullName: request.user.name,
|
createdFullName: request.user.name,
|
||||||
updateUserId: request.user.sub,
|
updateUserId: request.user.sub,
|
||||||
updateFullName: request.user.name,
|
updateFullName: request.user.name,
|
||||||
};
|
}
|
||||||
|
|
||||||
await this.evaluateChairmanRepository.save(postData, {
|
await this.evaluateChairmanRepository.save(postData, {
|
||||||
data: request,
|
data: request,
|
||||||
});
|
})
|
||||||
setLogDataDiff(request, { before: null, after: postData });
|
setLogDataDiff(request, { before: null, after: postData })
|
||||||
|
|
||||||
if (Number(requestBody.evaluate_no) < 2) {
|
if (Number(requestBody.evaluate_no) < 2) {
|
||||||
// #noted cronjob
|
// #noted cronjob
|
||||||
// แจ้งประธานเข้ามาบันทึกผลทุก 3 เดือน 2 ครั้ง
|
// แจ้งประธานเข้ามาบันทึกผลทุก 3 เดือน 2 ครั้ง
|
||||||
var dateSend = await findEndDate(3, requestBody.start_date);
|
var dateSend = await findEndDate(3, requestBody.start_date)
|
||||||
const nextNo = await (Number(requestBody.evaluate_no) + 1);
|
const nextNo = await (Number(requestBody.evaluate_no) + 1)
|
||||||
await new CallAPI()
|
await new CallAPI()
|
||||||
.PostData(request, "/placement/noti", {
|
.PostData(request, "/placement/noti", {
|
||||||
subject: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการครั้งที่ ${nextNo} ${assign.profile.prefixName}${assign.profile.firstName} ${assign.profile.lastName}`,
|
subject: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการครั้งที่ ${nextNo} ${assign.profile.prefixName}${assign.profile.firstName} ${assign.profile.lastName}`,
|
||||||
body: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการ (สำหรับคณะกรรมการ) ครั้งที่ ${nextNo} ${assign.profile.prefixName}${assign.profile.firstName} ${assign.profile.lastName}`,
|
body: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการ (สำหรับคณะกรรมการ) ครั้งที่ ${nextNo} ${assign.profile.prefixName}${assign.profile.firstName} ${assign.profile.lastName}`,
|
||||||
receiverUserId: director_id,
|
receiverUserId: director_id,
|
||||||
payload: "",
|
payload: "",
|
||||||
isSendMail: true,
|
isSendMail: true,
|
||||||
isSendInbox: true,
|
isSendInbox: true,
|
||||||
receiveDate: dateSend,
|
receiveDate: dateSend,
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch(error => {
|
||||||
console.error("Error calling API:", error);
|
console.error("Error calling API:", error)
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
return new HttpSuccess();
|
return new HttpSuccess()
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API แก้ไขข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
|
* API แก้ไขข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
|
||||||
*
|
*
|
||||||
* @summary แก้ไขข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
|
* @summary แก้ไขข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Put("")
|
@Put("")
|
||||||
async UpdateData(
|
async UpdateData(
|
||||||
// @Query() assign_id: string,
|
// @Query() assign_id: string,
|
||||||
@Query() evaluate_id: string,
|
@Query() evaluate_id: string,
|
||||||
@Body() requestBody: CreateEvaluateChairman,
|
@Body() requestBody: CreateEvaluateChairman,
|
||||||
@Request() request: RequestWithUser,
|
@Request() request: RequestWithUser
|
||||||
) {
|
) {
|
||||||
await new permission().PermissionUpdate(request, "SYS_PROBATION");
|
await new permission().PermissionUpdate(request, "SYS_PROBATION")
|
||||||
|
|
||||||
let evaluate = await this.evaluateChairmanRepository.findOne({
|
let evaluate = await this.evaluateChairmanRepository.findOne({
|
||||||
where: { id: evaluate_id },
|
where: { id: evaluate_id },
|
||||||
});
|
})
|
||||||
|
|
||||||
const before = evaluate;
|
const before = evaluate
|
||||||
|
|
||||||
if (!evaluate) {
|
if (!evaluate) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมิน");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมิน")
|
||||||
}
|
}
|
||||||
|
|
||||||
evaluate.chairman_dated = requestBody.chairman_dated;
|
evaluate.chairman_dated = requestBody.chairman_dated
|
||||||
evaluate.director1_dated = requestBody.director1_dated;
|
evaluate.director1_dated = requestBody.director1_dated
|
||||||
evaluate.director2_dated = requestBody.director2_dated;
|
evaluate.director2_dated = requestBody.director2_dated
|
||||||
evaluate.knowledge_level = requestBody.knowledge_level;
|
evaluate.knowledge_level = requestBody.knowledge_level
|
||||||
evaluate.apply_level = requestBody.apply_level;
|
evaluate.apply_level = requestBody.apply_level
|
||||||
evaluate.success_level = requestBody.success_level;
|
evaluate.success_level = requestBody.success_level
|
||||||
evaluate.achievement_other_desc = requestBody.achievement_other
|
evaluate.achievement_other_desc = requestBody.achievement_other ? requestBody.achievement_other.text : ""
|
||||||
? requestBody.achievement_other.text
|
evaluate.achievement_other_level = requestBody.achievement_other.text != "" ? Number(requestBody.achievement_other.level) : 0
|
||||||
: "";
|
|
||||||
evaluate.achievement_other_level =
|
|
||||||
requestBody.achievement_other.text != "" ? Number(requestBody.achievement_other.level) : 0;
|
|
||||||
|
|
||||||
evaluate.conduct1_level = requestBody.conduct1_level;
|
evaluate.conduct1_level = requestBody.conduct1_level
|
||||||
evaluate.conduct2_level = requestBody.conduct2_level;
|
evaluate.conduct2_level = requestBody.conduct2_level
|
||||||
evaluate.conduct3_level = requestBody.conduct3_level;
|
evaluate.conduct3_level = requestBody.conduct3_level
|
||||||
evaluate.conduct4_level = requestBody.conduct4_level;
|
evaluate.conduct4_level = requestBody.conduct4_level
|
||||||
evaluate.moral1_level = requestBody.moral1_level;
|
evaluate.moral1_level = requestBody.moral1_level
|
||||||
evaluate.moral2_level = requestBody.moral2_level;
|
evaluate.moral2_level = requestBody.moral2_level
|
||||||
evaluate.moral3_level = requestBody.moral3_level;
|
evaluate.moral3_level = requestBody.moral3_level
|
||||||
evaluate.discipline1_level = requestBody.discipline1_level;
|
evaluate.discipline1_level = requestBody.discipline1_level
|
||||||
evaluate.discipline2_level = requestBody.discipline2_level;
|
evaluate.discipline2_level = requestBody.discipline2_level
|
||||||
evaluate.discipline3_level = requestBody.discipline3_level;
|
evaluate.discipline3_level = requestBody.discipline3_level
|
||||||
evaluate.discipline4_level = requestBody.discipline4_level;
|
evaluate.discipline4_level = requestBody.discipline4_level
|
||||||
evaluate.discipline5_level = requestBody.discipline5_level;
|
evaluate.discipline5_level = requestBody.discipline5_level
|
||||||
evaluate.behavior_other_desc = requestBody.behavior_orther.text;
|
evaluate.behavior_other_desc = requestBody.behavior_orther.text
|
||||||
evaluate.behavior_other_level =
|
evaluate.behavior_other_level = requestBody.behavior_orther.text != "" ? Number(requestBody.behavior_orther.level) : 0
|
||||||
requestBody.behavior_orther.text != "" ? Number(requestBody.behavior_orther.level) : 0;
|
evaluate.develop_orientation_score = requestBody.develop_orientation_score
|
||||||
evaluate.develop_orientation_score = requestBody.develop_orientation_score;
|
evaluate.develop_self_learning_score = requestBody.develop_self_learning_score
|
||||||
evaluate.develop_self_learning_score = requestBody.develop_self_learning_score;
|
evaluate.develop_training_seminar_score = requestBody.develop_training_seminar_score
|
||||||
evaluate.develop_training_seminar_score = requestBody.develop_training_seminar_score;
|
evaluate.develop_other_training_score = requestBody.develop_other_training_score
|
||||||
evaluate.develop_other_training_score = requestBody.develop_other_training_score;
|
evaluate.develop_orientation_percent = requestBody.develop_orientation_percent
|
||||||
evaluate.develop_orientation_percent = requestBody.develop_orientation_percent;
|
evaluate.develop_self_learning_percent = requestBody.develop_self_learning_percent
|
||||||
evaluate.develop_self_learning_percent = requestBody.develop_self_learning_percent;
|
evaluate.develop_training_seminar_percent = requestBody.develop_training_seminar_percent
|
||||||
evaluate.develop_training_seminar_percent = requestBody.develop_training_seminar_percent;
|
evaluate.develop_other_training_percent = requestBody.develop_other_training_percent
|
||||||
evaluate.develop_other_training_percent = requestBody.develop_other_training_percent;
|
evaluate.develop_result = requestBody.develop_result
|
||||||
evaluate.develop_result = requestBody.develop_result;
|
evaluate.achievement_score = requestBody.achievement_score
|
||||||
evaluate.achievement_score = requestBody.achievement_score;
|
evaluate.achievement_score_total = requestBody.achievement_score_total
|
||||||
evaluate.achievement_score_total = requestBody.achievement_score_total;
|
evaluate.achievement_percent = requestBody.achievement_percent
|
||||||
evaluate.achievement_percent = requestBody.achievement_percent;
|
evaluate.achievement_result = requestBody.achievement_result
|
||||||
evaluate.achievement_result = requestBody.achievement_result;
|
evaluate.behavior_score = requestBody.behavior_score
|
||||||
evaluate.behavior_score = requestBody.behavior_score;
|
evaluate.behavior_score_total = requestBody.behavior_score_total
|
||||||
evaluate.behavior_score_total = requestBody.behavior_score_total;
|
evaluate.behavior_percent = requestBody.behavior_percent
|
||||||
evaluate.behavior_percent = requestBody.behavior_percent;
|
evaluate.behavior_result = requestBody.behavior_result
|
||||||
evaluate.behavior_result = requestBody.behavior_result;
|
evaluate.sum_score = requestBody.sum_score
|
||||||
evaluate.sum_score = requestBody.sum_score;
|
evaluate.sum_percent = requestBody.sum_percent
|
||||||
evaluate.sum_percent = requestBody.sum_percent;
|
evaluate.evaluate_result = requestBody.evaluate_result
|
||||||
evaluate.evaluate_result = requestBody.evaluate_result;
|
|
||||||
|
|
||||||
evaluate.updateUserId = request.user.sub;
|
evaluate.updateUserId = request.user.sub
|
||||||
evaluate.updateFullName = request.user.name;
|
evaluate.updateFullName = request.user.name
|
||||||
|
|
||||||
await this.evaluateChairmanRepository.save(evaluate, { data: request });
|
await this.evaluateChairmanRepository.save(evaluate, { data: request })
|
||||||
setLogDataDiff(request, { before, after: evaluate });
|
setLogDataDiff(request, { before, after: evaluate })
|
||||||
|
|
||||||
return new HttpSuccess();
|
return new HttpSuccess()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,394 +1,348 @@
|
||||||
import {
|
import { Controller, Route, Security, Tags, Request, SuccessResponse, Response, Get, Post, Body, Query, Put } from "tsoa"
|
||||||
Controller,
|
import HttpSuccess from "../interfaces/http-success"
|
||||||
Route,
|
import HttpStatusCode from "../interfaces/http-status"
|
||||||
Security,
|
import { RequestWithUser } from "../middlewares/user"
|
||||||
Tags,
|
import { findEndDate, setLogDataDiff } from "../interfaces/utils"
|
||||||
Request,
|
import { AppDataSource } from "../database/data-source"
|
||||||
SuccessResponse,
|
import { AssignDirector } from "../entities/AssignDirector"
|
||||||
Response,
|
import HttpError from "../interfaces/http-error"
|
||||||
Get,
|
import { Assign } from "../entities/Assign"
|
||||||
Post,
|
import { CreateEvaluateCommander, EvaluateCommander } from "../entities/EvaluateCommander"
|
||||||
Body,
|
import { Personal } from "../entities/Personal"
|
||||||
Query,
|
import CallAPI from "../interfaces/call-api"
|
||||||
Put,
|
import permission from "../interfaces/permission"
|
||||||
} 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")
|
@Route("api/v1/probation/evaluate")
|
||||||
@Tags("แบบประเมินผล (ผู้บังคับบัญชา)")
|
@Tags("แบบประเมินผล (ผู้บังคับบัญชา)")
|
||||||
@Security("bearerAuth")
|
@Security("bearerAuth")
|
||||||
@Response(
|
@Response(HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง")
|
||||||
HttpStatusCode.INTERNAL_SERVER_ERROR,
|
|
||||||
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง",
|
|
||||||
)
|
|
||||||
@SuccessResponse(HttpStatusCode.OK, "สำเร็จ")
|
|
||||||
export class EvaluateController extends Controller {
|
export class EvaluateController extends Controller {
|
||||||
private assignDirectorRepository = AppDataSource.getRepository(AssignDirector);
|
private assignDirectorRepository = AppDataSource.getRepository(AssignDirector)
|
||||||
private assignRepository = AppDataSource.getRepository(Assign);
|
private assignRepository = AppDataSource.getRepository(Assign)
|
||||||
private evaluateCommanderRepository = AppDataSource.getRepository(EvaluateCommander);
|
private evaluateCommanderRepository = AppDataSource.getRepository(EvaluateCommander)
|
||||||
private personalRepository = AppDataSource.getRepository(Personal);
|
private personalRepository = AppDataSource.getRepository(Personal)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API ข้อมูลตอนกดสร้างแบบประเมินผล (ผู้บังคับบัญชา)
|
* API ข้อมูลตอนกดสร้างแบบประเมินผล (ผู้บังคับบัญชา)
|
||||||
*
|
*
|
||||||
* @summary ข้อมูลตอนกดสร้างแบบประเมินผล (ผู้บังคับบัญชา)
|
* @summary ข้อมูลตอนกดสร้างแบบประเมินผล (ผู้บังคับบัญชา)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Get("create")
|
@Get("create")
|
||||||
async CreateEvaluate(@Query() assign_id: string, @Request() request: RequestWithUser) {
|
async CreateEvaluate(@Query() assign_id: string, @Request() request: RequestWithUser) {
|
||||||
await new permission().PermissionGet(request, "SYS_PROBATION");
|
await new permission().PermissionGet(request, "SYS_PROBATION")
|
||||||
|
|
||||||
const director = await this.assignDirectorRepository.findOne({
|
const director = await this.assignDirectorRepository.findOne({
|
||||||
select: ["personal_id"],
|
select: ["personal_id"],
|
||||||
where: {
|
where: {
|
||||||
assign_id,
|
assign_id,
|
||||||
role: "commander",
|
role: "commander",
|
||||||
},
|
},
|
||||||
});
|
})
|
||||||
if (!director) {
|
if (!director) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล")
|
||||||
}
|
}
|
||||||
const director_id = director.personal_id;
|
const director_id = director.personal_id
|
||||||
|
|
||||||
const assign = await this.assignRepository.findOne({
|
const assign = await this.assignRepository.findOne({
|
||||||
relations: ["profile"],
|
relations: ["profile"],
|
||||||
where: { id: assign_id },
|
where: { id: assign_id },
|
||||||
});
|
})
|
||||||
if (!assign) {
|
if (!assign) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน")
|
||||||
}
|
}
|
||||||
|
|
||||||
const profile = await (assign.profile
|
const profile = await (assign.profile
|
||||||
? {
|
? {
|
||||||
...assign.profile,
|
...assign.profile,
|
||||||
id: assign.profile.personal_id,
|
id: assign.profile.personal_id,
|
||||||
name:
|
name: assign.profile.prefixName + assign.profile.firstName + " " + assign.profile.lastName,
|
||||||
assign.profile.prefixName + assign.profile.firstName + " " + assign.profile.lastName,
|
Oc: assign.profile.organization,
|
||||||
Oc: assign.profile.organization,
|
}
|
||||||
}
|
: null)
|
||||||
: null);
|
|
||||||
|
|
||||||
const evaluate_amount = await this.evaluateCommanderRepository.count({
|
const evaluate_amount = await this.evaluateCommanderRepository.count({
|
||||||
where: {
|
where: {
|
||||||
assign_id,
|
assign_id,
|
||||||
director_id,
|
director_id,
|
||||||
},
|
},
|
||||||
});
|
})
|
||||||
const evaluate_no = await (evaluate_amount + 1);
|
const evaluate_no = await (evaluate_amount + 1)
|
||||||
const start_date =
|
const start_date = evaluate_amount == 0 ? assign.date_start : findEndDate(evaluate_amount * 3, assign.date_start)
|
||||||
evaluate_amount == 0
|
|
||||||
? assign.date_start
|
|
||||||
: findEndDate(evaluate_amount * 3, assign.date_start);
|
|
||||||
|
|
||||||
const commanderData = await this.assignDirectorRepository.findOne({
|
const commanderData = await this.assignDirectorRepository.findOne({
|
||||||
select: ["personal_id", "dated", "fullname", "position", "posType", "posLevel"],
|
select: ["personal_id", "dated", "fullname", "position", "posType", "posLevel"],
|
||||||
where: { personal_id: director_id },
|
where: { personal_id: director_id },
|
||||||
});
|
})
|
||||||
if (!commanderData) {
|
if (!commanderData) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้บังคับบัญชา");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้บังคับบัญชา")
|
||||||
}
|
}
|
||||||
const commander = await {
|
const commander = await {
|
||||||
...commanderData,
|
...commanderData,
|
||||||
name: commanderData.fullname,
|
name: commanderData.fullname,
|
||||||
label: `${commanderData.fullname} (${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})`,
|
label: `${commanderData.fullname} (${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})`,
|
||||||
};
|
}
|
||||||
|
|
||||||
return new HttpSuccess({
|
return new HttpSuccess({
|
||||||
person: profile,
|
person: profile,
|
||||||
assign,
|
assign,
|
||||||
evaluate_no: evaluate_no,
|
evaluate_no: evaluate_no,
|
||||||
start_date: start_date,
|
start_date: start_date,
|
||||||
end_date: findEndDate(3, start_date),
|
end_date: findEndDate(3, start_date),
|
||||||
director: commander,
|
director: commander,
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API ข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
|
* API ข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
|
||||||
*
|
*
|
||||||
* @summary ข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
|
* @summary ข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Get("")
|
@Get("")
|
||||||
async GetEvaluate(
|
async GetEvaluate(@Request() request: RequestWithUser, @Query() assign_id: string, @Query() evaluate_no?: string) {
|
||||||
@Request() request: RequestWithUser,
|
await new permission().PermissionGet(request, "SYS_PROBATION")
|
||||||
@Query() assign_id: string,
|
|
||||||
@Query() evaluate_no?: string,
|
|
||||||
) {
|
|
||||||
await new permission().PermissionGet(request, "SYS_PROBATION");
|
|
||||||
|
|
||||||
// ต้องปรับเป็น id ของคนที่ access เข้ามา
|
// ต้องปรับเป็น id ของคนที่ access เข้ามา
|
||||||
const director = await this.assignDirectorRepository.findOne({
|
const director = await this.assignDirectorRepository.findOne({
|
||||||
select: ["personal_id"],
|
select: ["personal_id"],
|
||||||
where: {
|
where: {
|
||||||
assign_id,
|
assign_id,
|
||||||
role: "commander",
|
role: "commander",
|
||||||
},
|
},
|
||||||
});
|
})
|
||||||
if (!director) {
|
if (!director) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล")
|
||||||
}
|
}
|
||||||
const director_id = director.personal_id;
|
const director_id = director.personal_id
|
||||||
let evaluate: any = null;
|
let evaluate: any = null
|
||||||
if (evaluate_no) {
|
if (evaluate_no) {
|
||||||
evaluate = await this.evaluateCommanderRepository.findOne({
|
evaluate = await this.evaluateCommanderRepository.findOne({
|
||||||
where: {
|
where: {
|
||||||
director_id,
|
director_id,
|
||||||
assign_id,
|
assign_id,
|
||||||
no: evaluate_no,
|
no: evaluate_no,
|
||||||
},
|
},
|
||||||
});
|
})
|
||||||
} else {
|
} else {
|
||||||
evaluate = await this.evaluateCommanderRepository.find({
|
evaluate = await this.evaluateCommanderRepository.find({
|
||||||
where: {
|
where: {
|
||||||
director_id,
|
director_id,
|
||||||
assign_id,
|
assign_id,
|
||||||
},
|
},
|
||||||
});
|
})
|
||||||
|
|
||||||
if (evaluate)
|
if (evaluate)
|
||||||
evaluate = await evaluate.map((element: EvaluateCommander) => ({
|
evaluate = await evaluate.map((element: EvaluateCommander) => ({
|
||||||
...element,
|
...element,
|
||||||
no: Number(element.no),
|
no: Number(element.no),
|
||||||
}));
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!evaluate) {
|
if (!evaluate) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบประเมิน");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบประเมิน")
|
||||||
}
|
}
|
||||||
|
|
||||||
const assign = await this.assignRepository.findOne({
|
const assign = await this.assignRepository.findOne({
|
||||||
where: { id: assign_id },
|
where: { id: assign_id },
|
||||||
});
|
})
|
||||||
if (!assign) {
|
if (!assign) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน")
|
||||||
}
|
}
|
||||||
|
|
||||||
// const profile = await (assign.profile
|
// const profile = await (assign.profile
|
||||||
// ? {
|
// ? {
|
||||||
// ...assign.profile,
|
// ...assign.profile,
|
||||||
// id: assign.profile.personal_id,
|
// id: assign.profile.personal_id,
|
||||||
// name:
|
// name:
|
||||||
// assign.profile.prefixName +
|
// assign.profile.prefixName +
|
||||||
// assign.profile.firstName +
|
// assign.profile.firstName +
|
||||||
// " " +
|
// " " +
|
||||||
// assign.profile.lastName,
|
// assign.profile.lastName,
|
||||||
// Oc: assign.profile.organization,
|
// Oc: assign.profile.organization,
|
||||||
// }
|
// }
|
||||||
// : null);
|
// : null);
|
||||||
|
|
||||||
// const evaluate_amount = await this.evaluateCommanderRepository.count({
|
// const evaluate_amount = await this.evaluateCommanderRepository.count({
|
||||||
// where: {
|
// where: {
|
||||||
// assign_id,
|
// assign_id,
|
||||||
// director_id,
|
// director_id,
|
||||||
// },
|
// },
|
||||||
// });
|
// });
|
||||||
// const evaluate_no = await (evaluate_amount + 1);
|
// const evaluate_no = await (evaluate_amount + 1);
|
||||||
// const start_date =
|
// const start_date =
|
||||||
// evaluate_amount == 0
|
// evaluate_amount == 0
|
||||||
// ? assign.date_start
|
// ? assign.date_start
|
||||||
// : findEndDate(evaluate_amount * 3, assign.date_start);
|
// : findEndDate(evaluate_amount * 3, assign.date_start);
|
||||||
|
|
||||||
const directorData = await this.assignDirectorRepository.find({
|
const directorData = await this.assignDirectorRepository.find({
|
||||||
select: ["personal_id", "dated", "fullname", "position", "posType", "posLevel"],
|
select: ["personal_id", "dated", "fullname", "position", "posType", "posLevel"],
|
||||||
where: { personal_id: director_id },
|
where: { personal_id: director_id },
|
||||||
});
|
})
|
||||||
|
|
||||||
const directors = await directorData.map((element) => ({
|
const directors = await directorData.map(element => ({
|
||||||
...element,
|
...element,
|
||||||
name: element.fullname,
|
name: element.fullname,
|
||||||
label: `${element.fullname} (${element.position}, ${element.posType}: ${element.posLevel})`,
|
label: `${element.fullname} (${element.position}, ${element.posType}: ${element.posLevel})`,
|
||||||
}));
|
}))
|
||||||
|
|
||||||
const experimenteeData = await this.personalRepository.find({
|
const experimenteeData = await this.personalRepository.find({
|
||||||
select: [
|
select: ["personal_id", "prefixName", "firstName", "lastName", "positionName", "positionLevelName", "organization"],
|
||||||
"personal_id",
|
where: { personal_id: assign.personal_id },
|
||||||
"prefixName",
|
})
|
||||||
"firstName",
|
|
||||||
"lastName",
|
|
||||||
"positionName",
|
|
||||||
"positionLevelName",
|
|
||||||
"organization",
|
|
||||||
],
|
|
||||||
where: { personal_id: assign.personal_id },
|
|
||||||
});
|
|
||||||
|
|
||||||
const experimentee = await experimenteeData.map((element) => ({
|
const experimentee = await experimenteeData.map(element => ({
|
||||||
...element,
|
...element,
|
||||||
name: element.prefixName + element.firstName + " " + element.lastName,
|
name: element.prefixName + element.firstName + " " + element.lastName,
|
||||||
Oc: element.organization,
|
Oc: element.organization,
|
||||||
}));
|
}))
|
||||||
|
|
||||||
return new HttpSuccess({
|
return new HttpSuccess({
|
||||||
experimentee: experimentee,
|
experimentee: experimentee,
|
||||||
director: directors ? directors : null,
|
director: directors ? directors : null,
|
||||||
assign,
|
assign,
|
||||||
evaluate,
|
evaluate,
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API บันทึกข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
|
* API บันทึกข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
|
||||||
*
|
*
|
||||||
* @summary บันทึกข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
|
* @summary บันทึกข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Post("")
|
@Post("")
|
||||||
async PostData(
|
async PostData(@Query() assign_id: string, @Body() requestBody: CreateEvaluateCommander, @Request() request: RequestWithUser) {
|
||||||
@Query() assign_id: string,
|
await new permission().PermissionUpdate(request, "SYS_PROBATION")
|
||||||
@Body() requestBody: CreateEvaluateCommander,
|
|
||||||
@Request() request: RequestWithUser,
|
|
||||||
) {
|
|
||||||
await new permission().PermissionUpdate(request, "SYS_PROBATION");
|
|
||||||
|
|
||||||
const director = await this.assignDirectorRepository.findOne({
|
const director = await this.assignDirectorRepository.findOne({
|
||||||
select: ["personal_id"],
|
select: ["personal_id"],
|
||||||
where: {
|
where: {
|
||||||
assign_id,
|
assign_id,
|
||||||
role: "commander",
|
role: "commander",
|
||||||
},
|
},
|
||||||
});
|
})
|
||||||
if (!director) {
|
if (!director) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล")
|
||||||
}
|
}
|
||||||
|
|
||||||
const director_id = director.personal_id;
|
const director_id = director.personal_id
|
||||||
|
|
||||||
const assign = await this.assignRepository.findOne({
|
const assign = await this.assignRepository.findOne({
|
||||||
relations: ["profile"],
|
relations: ["profile"],
|
||||||
where: { id: assign_id },
|
where: { id: assign_id },
|
||||||
});
|
})
|
||||||
if (!assign) {
|
if (!assign) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน")
|
||||||
}
|
}
|
||||||
|
|
||||||
const postData: any = await {
|
const postData: any = await {
|
||||||
assign_id,
|
assign_id,
|
||||||
...requestBody,
|
...requestBody,
|
||||||
director_id,
|
director_id,
|
||||||
no: requestBody.evaluate_no,
|
no: requestBody.evaluate_no,
|
||||||
date_start: requestBody.start_date,
|
date_start: requestBody.start_date,
|
||||||
personal_id: assign.personal_id,
|
personal_id: assign.personal_id,
|
||||||
|
|
||||||
achievement_other_desc: requestBody.achievement_other
|
achievement_other_desc: requestBody.achievement_other ? requestBody.achievement_other.text : "",
|
||||||
? requestBody.achievement_other.text
|
achievement_other_level: requestBody.achievement_other ? Number(requestBody.achievement_other.level) : 0,
|
||||||
: "",
|
behavior_other_desc: requestBody.behavior_orther.text,
|
||||||
achievement_other_level: requestBody.achievement_other
|
behavior_other_level: requestBody.behavior_orther.text != "" ? Number(requestBody.behavior_orther.level) : 0,
|
||||||
? 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,
|
createdUserId: request.user.sub,
|
||||||
createdFullName: request.user.name,
|
createdFullName: request.user.name,
|
||||||
updateUserId: request.user.sub,
|
updateUserId: request.user.sub,
|
||||||
updateFullName: request.user.name,
|
updateFullName: request.user.name,
|
||||||
};
|
}
|
||||||
|
|
||||||
await this.evaluateCommanderRepository.save(postData, {
|
await this.evaluateCommanderRepository.save(postData, {
|
||||||
data: request,
|
data: request,
|
||||||
});
|
})
|
||||||
setLogDataDiff(request, { before: null, after: postData });
|
setLogDataDiff(request, { before: null, after: postData })
|
||||||
|
|
||||||
if (Number(requestBody.evaluate_no) < 2) {
|
if (Number(requestBody.evaluate_no) < 2) {
|
||||||
// #noted cronjob
|
// #noted cronjob
|
||||||
// แจ้งผู้บังคับบัญชาเข้ามาบันทึกผลทุก 3 เดือน 2 ครั้ง
|
// แจ้งผู้บังคับบัญชาเข้ามาบันทึกผลทุก 3 เดือน 2 ครั้ง
|
||||||
var dateSend = await findEndDate(3, requestBody.start_date);
|
var dateSend = await findEndDate(3, requestBody.start_date)
|
||||||
const nextNo = await (Number(requestBody.evaluate_no) + 1);
|
const nextNo = await (Number(requestBody.evaluate_no) + 1)
|
||||||
await new CallAPI()
|
await new CallAPI()
|
||||||
.PostData(request, "/placement/noti", {
|
.PostData(request, "/placement/noti", {
|
||||||
subject: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการครั้งที่ ${nextNo} ${assign.profile.prefixName}${assign.profile.firstName} ${assign.profile.lastName}`,
|
subject: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการครั้งที่ ${nextNo} ${assign.profile.prefixName}${assign.profile.firstName} ${assign.profile.lastName}`,
|
||||||
body: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการ (สำหรับผู้บังคับบัญชา) ครั้งที่ ${nextNo} ${assign.profile.prefixName}${assign.profile.firstName} ${assign.profile.lastName}`,
|
body: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการ (สำหรับผู้บังคับบัญชา) ครั้งที่ ${nextNo} ${assign.profile.prefixName}${assign.profile.firstName} ${assign.profile.lastName}`,
|
||||||
receiverUserId: director_id,
|
receiverUserId: director_id,
|
||||||
payload: "",
|
payload: "",
|
||||||
isSendMail: true,
|
isSendMail: true,
|
||||||
isSendInbox: true,
|
isSendInbox: true,
|
||||||
receiveDate: dateSend,
|
receiveDate: dateSend,
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch(error => {
|
||||||
console.error("Error calling API:", error);
|
console.error("Error calling API:", error)
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
return new HttpSuccess();
|
return new HttpSuccess()
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API แก้ไขข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
|
* API แก้ไขข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
|
||||||
*
|
*
|
||||||
* @summary แก้ไขข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
|
* @summary แก้ไขข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Put("")
|
@Put("")
|
||||||
async UpdateData(
|
async UpdateData(
|
||||||
// @Query() assign_id: string,
|
// @Query() assign_id: string,
|
||||||
@Query() evaluate_id: string,
|
@Query() evaluate_id: string,
|
||||||
@Body() requestBody: CreateEvaluateCommander,
|
@Body() requestBody: CreateEvaluateCommander,
|
||||||
@Request() request: RequestWithUser,
|
@Request() request: RequestWithUser
|
||||||
) {
|
) {
|
||||||
await new permission().PermissionUpdate(request, "SYS_PROBATION");
|
await new permission().PermissionUpdate(request, "SYS_PROBATION")
|
||||||
|
|
||||||
let evaluate = await this.evaluateCommanderRepository.findOne({
|
let evaluate = await this.evaluateCommanderRepository.findOne({
|
||||||
where: { id: evaluate_id },
|
where: { id: evaluate_id },
|
||||||
});
|
})
|
||||||
|
|
||||||
const before = evaluate;
|
const before = evaluate
|
||||||
|
|
||||||
if (!evaluate) {
|
if (!evaluate) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมิน");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมิน")
|
||||||
}
|
}
|
||||||
|
|
||||||
evaluate.commander_dated = requestBody.commander_dated;
|
evaluate.commander_dated = requestBody.commander_dated
|
||||||
evaluate.knowledge_level = requestBody.knowledge_level;
|
evaluate.knowledge_level = requestBody.knowledge_level
|
||||||
evaluate.skill_level = requestBody.skill_level;
|
evaluate.skill_level = requestBody.skill_level
|
||||||
evaluate.competency_level = requestBody.competency_level;
|
evaluate.competency_level = requestBody.competency_level
|
||||||
evaluate.learn_level = requestBody.learn_level;
|
evaluate.learn_level = requestBody.learn_level
|
||||||
evaluate.apply_level = requestBody.apply_level;
|
evaluate.apply_level = requestBody.apply_level
|
||||||
evaluate.success_level = requestBody.success_level;
|
evaluate.success_level = requestBody.success_level
|
||||||
evaluate.achievement_other_desc = requestBody.achievement_other
|
evaluate.achievement_other_desc = requestBody.achievement_other ? requestBody.achievement_other.text : ""
|
||||||
? requestBody.achievement_other.text
|
evaluate.achievement_other_level = requestBody.achievement_other.text != "" ? Number(requestBody.achievement_other.level) : 0
|
||||||
: "";
|
|
||||||
evaluate.achievement_other_level =
|
|
||||||
requestBody.achievement_other.text != "" ? Number(requestBody.achievement_other.level) : 0;
|
|
||||||
|
|
||||||
evaluate.conduct1_level = requestBody.conduct1_level;
|
evaluate.conduct1_level = requestBody.conduct1_level
|
||||||
evaluate.conduct2_level = requestBody.conduct2_level;
|
evaluate.conduct2_level = requestBody.conduct2_level
|
||||||
evaluate.conduct3_level = requestBody.conduct3_level;
|
evaluate.conduct3_level = requestBody.conduct3_level
|
||||||
evaluate.conduct4_level = requestBody.conduct4_level;
|
evaluate.conduct4_level = requestBody.conduct4_level
|
||||||
evaluate.moral1_level = requestBody.moral1_level;
|
evaluate.moral1_level = requestBody.moral1_level
|
||||||
evaluate.moral2_level = requestBody.moral2_level;
|
evaluate.moral2_level = requestBody.moral2_level
|
||||||
evaluate.moral3_level = requestBody.moral3_level;
|
evaluate.moral3_level = requestBody.moral3_level
|
||||||
evaluate.discipline1_level = requestBody.discipline1_level;
|
evaluate.discipline1_level = requestBody.discipline1_level
|
||||||
evaluate.discipline2_level = requestBody.discipline2_level;
|
evaluate.discipline2_level = requestBody.discipline2_level
|
||||||
evaluate.discipline3_level = requestBody.discipline3_level;
|
evaluate.discipline3_level = requestBody.discipline3_level
|
||||||
evaluate.discipline4_level = requestBody.discipline4_level;
|
evaluate.discipline4_level = requestBody.discipline4_level
|
||||||
evaluate.discipline5_level = requestBody.discipline5_level;
|
evaluate.discipline5_level = requestBody.discipline5_level
|
||||||
evaluate.behavior_other_desc = requestBody.behavior_orther.text;
|
evaluate.behavior_other_desc = requestBody.behavior_orther.text
|
||||||
evaluate.behavior_other_level =
|
evaluate.behavior_other_level = requestBody.behavior_orther.text != "" ? Number(requestBody.behavior_orther.level) : 0
|
||||||
requestBody.behavior_orther.text != "" ? Number(requestBody.behavior_orther.level) : 0;
|
evaluate.behavior_strength_desc = requestBody.behavior_strength_desc
|
||||||
evaluate.behavior_strength_desc = requestBody.behavior_strength_desc;
|
evaluate.behavior_improve_desc = requestBody.behavior_improve_desc
|
||||||
evaluate.behavior_improve_desc = requestBody.behavior_improve_desc;
|
evaluate.orientation = requestBody.orientation
|
||||||
evaluate.orientation = requestBody.orientation;
|
evaluate.self_learning = requestBody.self_learning
|
||||||
evaluate.self_learning = requestBody.self_learning;
|
evaluate.training_seminar = requestBody.training_seminar
|
||||||
evaluate.training_seminar = requestBody.training_seminar;
|
evaluate.other_training = requestBody.other_training
|
||||||
evaluate.other_training = requestBody.other_training;
|
evaluate.updateUserId = request.user.sub
|
||||||
evaluate.updateUserId = request.user.sub;
|
evaluate.updateFullName = request.user.name
|
||||||
evaluate.updateFullName = request.user.name;
|
|
||||||
|
|
||||||
await this.evaluateCommanderRepository.save(evaluate, { data: request });
|
await this.evaluateCommanderRepository.save(evaluate, { data: request })
|
||||||
setLogDataDiff(request, { before, after: evaluate });
|
setLogDataDiff(request, { before, after: evaluate })
|
||||||
|
|
||||||
return new HttpSuccess();
|
return new HttpSuccess()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,6 @@ import permission from "../interfaces/permission";
|
||||||
HttpStatusCode.INTERNAL_SERVER_ERROR,
|
HttpStatusCode.INTERNAL_SERVER_ERROR,
|
||||||
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง",
|
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง",
|
||||||
)
|
)
|
||||||
@SuccessResponse(HttpStatusCode.OK, "สำเร็จ")
|
|
||||||
export class EvaluateRecordController extends Controller {
|
export class EvaluateRecordController extends Controller {
|
||||||
private assignDirectorRepository = AppDataSource.getRepository(AssignDirector);
|
private assignDirectorRepository = AppDataSource.getRepository(AssignDirector);
|
||||||
private assignRepository = AppDataSource.getRepository(Assign);
|
private assignRepository = AppDataSource.getRepository(Assign);
|
||||||
|
|
|
||||||
|
|
@ -1,502 +1,418 @@
|
||||||
import {
|
import { Controller, Route, Security, Tags, Request, SuccessResponse, Response, Get, Post, Body, Query, Put } from "tsoa"
|
||||||
Controller,
|
import HttpSuccess from "../interfaces/http-success"
|
||||||
Route,
|
import HttpStatusCode from "../interfaces/http-status"
|
||||||
Security,
|
import { RequestWithUser } from "../middlewares/user"
|
||||||
Tags,
|
import { setLogDataDiff } from "../interfaces/utils"
|
||||||
Request,
|
import { AppDataSource } from "../database/data-source"
|
||||||
SuccessResponse,
|
import { AssignDirector } from "../entities/AssignDirector"
|
||||||
Response,
|
import HttpError from "../interfaces/http-error"
|
||||||
Get,
|
import { Assign } from "../entities/Assign"
|
||||||
Post,
|
import { Personal } from "../entities/Personal"
|
||||||
Body,
|
import CallAPI from "../interfaces/call-api"
|
||||||
Query,
|
import { EvaluateChairman } from "../entities/EvaluateChairman"
|
||||||
Put,
|
import { CreateEvaluateResult, EvaluateResult } from "../entities/EvaluateResult"
|
||||||
} from "tsoa";
|
import permission from "../interfaces/permission"
|
||||||
import HttpSuccess from "../interfaces/http-success";
|
|
||||||
import HttpStatusCode from "../interfaces/http-status";
|
|
||||||
import { RequestWithUser } from "../middlewares/user";
|
|
||||||
import { 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 { Personal } from "../entities/Personal";
|
|
||||||
import CallAPI from "../interfaces/call-api";
|
|
||||||
import { EvaluateChairman } from "../entities/EvaluateChairman";
|
|
||||||
import { CreateEvaluateResult, EvaluateResult } from "../entities/EvaluateResult";
|
|
||||||
import permission from "../interfaces/permission";
|
|
||||||
|
|
||||||
@Route("api/v1/probation/evaluate-result")
|
@Route("api/v1/probation/evaluate-result")
|
||||||
@Tags("แบบรายงานการประเมินฯ")
|
@Tags("แบบรายงานการประเมินฯ")
|
||||||
@Security("bearerAuth")
|
@Security("bearerAuth")
|
||||||
@Response(
|
@Response(HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง")
|
||||||
HttpStatusCode.INTERNAL_SERVER_ERROR,
|
|
||||||
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง",
|
|
||||||
)
|
|
||||||
@SuccessResponse(HttpStatusCode.OK, "สำเร็จ")
|
|
||||||
export class EvaluateResultController extends Controller {
|
export class EvaluateResultController extends Controller {
|
||||||
private assignDirectorRepository = AppDataSource.getRepository(AssignDirector);
|
private assignDirectorRepository = AppDataSource.getRepository(AssignDirector)
|
||||||
private assignRepository = AppDataSource.getRepository(Assign);
|
private assignRepository = AppDataSource.getRepository(Assign)
|
||||||
private evaluateChairmanRepository = AppDataSource.getRepository(EvaluateChairman);
|
private evaluateChairmanRepository = AppDataSource.getRepository(EvaluateChairman)
|
||||||
private personalRepository = AppDataSource.getRepository(Personal);
|
private personalRepository = AppDataSource.getRepository(Personal)
|
||||||
private evaluateResultRepository = AppDataSource.getRepository(EvaluateResult);
|
private evaluateResultRepository = AppDataSource.getRepository(EvaluateResult)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API ข้อมูลตอนกดสร้างแบบรายงานการประเมินฯ
|
* API ข้อมูลตอนกดสร้างแบบรายงานการประเมินฯ
|
||||||
*
|
*
|
||||||
* @summary ข้อมูลตอนกดสร้างแบบรายงานการประเมินฯ
|
* @summary ข้อมูลตอนกดสร้างแบบรายงานการประเมินฯ
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Get("create")
|
@Get("create")
|
||||||
async CreateEvaluate(@Query() assign_id: string, @Request() request: RequestWithUser) {
|
async CreateEvaluate(@Query() assign_id: string, @Request() request: RequestWithUser) {
|
||||||
await new permission().PermissionGet(request, "SYS_PROBATION");
|
await new permission().PermissionGet(request, "SYS_PROBATION")
|
||||||
|
|
||||||
const assign = await this.assignRepository.findOne({
|
const assign = await this.assignRepository.findOne({
|
||||||
relations: ["profile"],
|
relations: ["profile"],
|
||||||
where: { id: assign_id },
|
where: { id: assign_id },
|
||||||
});
|
})
|
||||||
if (!assign) {
|
if (!assign) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน")
|
||||||
}
|
}
|
||||||
|
|
||||||
const profile = await (assign.profile
|
const profile = await (assign.profile
|
||||||
? {
|
? {
|
||||||
...assign.profile,
|
...assign.profile,
|
||||||
id: assign.profile.personal_id,
|
id: assign.profile.personal_id,
|
||||||
name:
|
name: assign.profile.prefixName + assign.profile.firstName + " " + assign.profile.lastName,
|
||||||
assign.profile.prefixName + assign.profile.firstName + " " + assign.profile.lastName,
|
Oc: assign.profile.organization,
|
||||||
Oc: assign.profile.organization,
|
}
|
||||||
}
|
: null)
|
||||||
: null);
|
|
||||||
|
|
||||||
const directorData = await this.assignDirectorRepository.find({
|
const directorData = await this.assignDirectorRepository.find({
|
||||||
where: { assign_id },
|
where: { assign_id },
|
||||||
order: { ordering: "ASC" },
|
order: { ordering: "ASC" },
|
||||||
});
|
})
|
||||||
|
|
||||||
if (!directorData) {
|
if (!directorData) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน")
|
||||||
}
|
}
|
||||||
|
|
||||||
let mentors = [];
|
let mentors = []
|
||||||
const mentorList = await directorData.filter((x) => x.role == "mentor");
|
const mentorList = await directorData.filter(x => x.role == "mentor")
|
||||||
if (mentorList.length > 0) {
|
if (mentorList.length > 0) {
|
||||||
for (let index = 0; index < mentorList.length; index++) {
|
for (let index = 0; index < mentorList.length; index++) {
|
||||||
const e = await mentorList[index];
|
const e = await mentorList[index]
|
||||||
|
|
||||||
mentors.push({
|
mentors.push({
|
||||||
personal_id: e.personal_id,
|
personal_id: e.personal_id,
|
||||||
dated: e.dated,
|
dated: e.dated,
|
||||||
name: e.fullname,
|
name: e.fullname,
|
||||||
label:
|
label: e.fullname + " " + (e.position ? `(${e.position}, ${e.posType}: ${e.posLevel})` : ""),
|
||||||
e.fullname + " " + (e.position ? `(${e.position}, ${e.posType}: ${e.posLevel})` : ""),
|
position: e.position,
|
||||||
position: e.position,
|
posType: e.posType,
|
||||||
posType: e.posType,
|
posLevel: e.posLevel,
|
||||||
posLevel: e.posLevel,
|
})
|
||||||
});
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
const commanderData = await (directorData.find((x) => x.role == "commander") ?? null);
|
const commanderData = await (directorData.find(x => x.role == "commander") ?? null)
|
||||||
|
|
||||||
const commander =
|
const commander =
|
||||||
commanderData != null
|
commanderData != null
|
||||||
? {
|
? {
|
||||||
personal_id: commanderData.personal_id,
|
personal_id: commanderData.personal_id,
|
||||||
dated: commanderData.dated,
|
dated: commanderData.dated,
|
||||||
name: commanderData.fullname,
|
name: commanderData.fullname,
|
||||||
label:
|
label: commanderData.fullname + " " + (commanderData.position ? `(${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})` : ""),
|
||||||
commanderData.fullname +
|
position: commanderData.position,
|
||||||
" " +
|
posType: commanderData.posType,
|
||||||
(commanderData.position
|
posLevel: commanderData.posLevel,
|
||||||
? `(${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})`
|
}
|
||||||
: ""),
|
: null
|
||||||
position: commanderData.position,
|
|
||||||
posType: commanderData.posType,
|
|
||||||
posLevel: commanderData.posLevel,
|
|
||||||
}
|
|
||||||
: null;
|
|
||||||
|
|
||||||
const chairmanData = await (directorData.find((x) => x.role == "chairman") ?? null);
|
const chairmanData = await (directorData.find(x => x.role == "chairman") ?? null)
|
||||||
const chairman =
|
const chairman =
|
||||||
chairmanData != null
|
chairmanData != null
|
||||||
? {
|
? {
|
||||||
personal_id: chairmanData.personal_id,
|
personal_id: chairmanData.personal_id,
|
||||||
dated: chairmanData.dated,
|
dated: chairmanData.dated,
|
||||||
name: chairmanData.fullname,
|
name: chairmanData.fullname,
|
||||||
label:
|
label: chairmanData.fullname + " " + (chairmanData.position ? `(${chairmanData.position}, ${chairmanData.posType}: ${chairmanData.posLevel})` : ""),
|
||||||
chairmanData.fullname +
|
position: chairmanData.position,
|
||||||
" " +
|
posType: chairmanData.posType,
|
||||||
(chairmanData.position
|
posLevel: chairmanData.posLevel,
|
||||||
? `(${chairmanData.position}, ${chairmanData.posType}: ${chairmanData.posLevel})`
|
}
|
||||||
: ""),
|
: null
|
||||||
position: chairmanData.position,
|
|
||||||
posType: chairmanData.posType,
|
|
||||||
posLevel: chairmanData.posLevel,
|
|
||||||
}
|
|
||||||
: null;
|
|
||||||
|
|
||||||
const resultData = await this.evaluateChairmanRepository.findOne({
|
const resultData = await this.evaluateChairmanRepository.findOne({
|
||||||
select: [
|
select: ["develop_orientation_score", "develop_self_learning_score", "develop_training_seminar_score", "evaluate_result"],
|
||||||
"develop_orientation_score",
|
where: {
|
||||||
"develop_self_learning_score",
|
assign_id,
|
||||||
"develop_training_seminar_score",
|
},
|
||||||
"evaluate_result",
|
})
|
||||||
],
|
|
||||||
where: {
|
|
||||||
assign_id,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!resultData) {
|
if (!resultData) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมินผล");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมินผล")
|
||||||
}
|
}
|
||||||
|
|
||||||
const develop_complete = await (resultData.develop_orientation_score > 0 &&
|
const develop_complete = await (resultData.develop_orientation_score > 0 && resultData.develop_self_learning_score > 0 && resultData.develop_training_seminar_score > 0 ? 1 : 2)
|
||||||
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 evaluate_result = await (resultData.evaluate_result == 1 ? 1 : 2)
|
||||||
|
|
||||||
const result = await {
|
const result = await {
|
||||||
develop_complete: develop_complete,
|
develop_complete: develop_complete,
|
||||||
evaluate_result: evaluate_result,
|
evaluate_result: evaluate_result,
|
||||||
};
|
}
|
||||||
|
|
||||||
return new HttpSuccess({
|
return new HttpSuccess({
|
||||||
person: profile,
|
person: profile,
|
||||||
assign,
|
assign,
|
||||||
result,
|
result,
|
||||||
mentors,
|
mentors,
|
||||||
commander,
|
commander,
|
||||||
chairman,
|
chairman,
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API ข้อมูลแบบรายงานการประเมินฯ
|
* API ข้อมูลแบบรายงานการประเมินฯ
|
||||||
*
|
*
|
||||||
* @summary ข้อมูลแบบรายงานการประเมินฯ
|
* @summary ข้อมูลแบบรายงานการประเมินฯ
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Get("")
|
@Get("")
|
||||||
async GetEvaluate(
|
async GetEvaluate(@Request() request: RequestWithUser, @Query() assign_id: string, @Query() evaluate_no?: string) {
|
||||||
@Request() request: RequestWithUser,
|
await new permission().PermissionGet(request, "SYS_PROBATION")
|
||||||
@Query() assign_id: string,
|
|
||||||
@Query() evaluate_no?: string,
|
|
||||||
) {
|
|
||||||
await new permission().PermissionGet(request, "SYS_PROBATION");
|
|
||||||
|
|
||||||
// ต้องปรับเป็น id ของคนที่ access เข้ามา
|
// ต้องปรับเป็น id ของคนที่ access เข้ามา
|
||||||
const director = await this.assignDirectorRepository.findOne({
|
const director = await this.assignDirectorRepository.findOne({
|
||||||
select: ["personal_id"],
|
select: ["personal_id"],
|
||||||
where: {
|
where: {
|
||||||
assign_id,
|
assign_id,
|
||||||
role: "chairman",
|
role: "chairman",
|
||||||
},
|
},
|
||||||
});
|
})
|
||||||
if (!director) {
|
if (!director) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล")
|
||||||
}
|
}
|
||||||
const director_id = director.personal_id;
|
const director_id = director.personal_id
|
||||||
|
|
||||||
const evaluate = await this.evaluateResultRepository.findOne({
|
const evaluate = await this.evaluateResultRepository.findOne({
|
||||||
where: {
|
where: {
|
||||||
director_id,
|
director_id,
|
||||||
assign_id,
|
assign_id,
|
||||||
},
|
},
|
||||||
});
|
})
|
||||||
|
|
||||||
if (!evaluate) {
|
if (!evaluate) {
|
||||||
return new HttpSuccess(null);
|
return new HttpSuccess(null)
|
||||||
}
|
}
|
||||||
|
|
||||||
const assign = await this.assignRepository.findOne({
|
const assign = await this.assignRepository.findOne({
|
||||||
where: { id: assign_id },
|
where: { id: assign_id },
|
||||||
});
|
})
|
||||||
if (!assign) {
|
if (!assign) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน")
|
||||||
}
|
}
|
||||||
|
|
||||||
const experimenteeData = await this.personalRepository.findOne({
|
const experimenteeData = await this.personalRepository.findOne({
|
||||||
select: [
|
select: ["personal_id", "prefixName", "firstName", "lastName", "positionName", "positionLevelName", "organization"],
|
||||||
"personal_id",
|
where: { personal_id: assign.personal_id },
|
||||||
"prefixName",
|
})
|
||||||
"firstName",
|
|
||||||
"lastName",
|
|
||||||
"positionName",
|
|
||||||
"positionLevelName",
|
|
||||||
"organization",
|
|
||||||
],
|
|
||||||
where: { personal_id: assign.personal_id },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!experimenteeData) {
|
if (!experimenteeData) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล")
|
||||||
}
|
}
|
||||||
const experimentee = await {
|
const experimentee = await {
|
||||||
...experimenteeData,
|
...experimenteeData,
|
||||||
name:
|
name: experimenteeData.prefixName + experimenteeData.firstName + " " + experimenteeData.lastName,
|
||||||
experimenteeData.prefixName + experimenteeData.firstName + " " + experimenteeData.lastName,
|
Oc: experimenteeData.organization,
|
||||||
Oc: experimenteeData.organization,
|
}
|
||||||
};
|
|
||||||
|
|
||||||
const directorData = await this.assignDirectorRepository.find({
|
const directorData = await this.assignDirectorRepository.find({
|
||||||
where: { assign_id },
|
where: { assign_id },
|
||||||
order: { ordering: "ASC" },
|
order: { ordering: "ASC" },
|
||||||
});
|
})
|
||||||
|
|
||||||
if (!directorData) {
|
if (!directorData) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน")
|
||||||
}
|
}
|
||||||
|
|
||||||
let mentors = [];
|
let mentors = []
|
||||||
const mentorList = await directorData.filter((x) => x.role == "mentor");
|
const mentorList = await directorData.filter(x => x.role == "mentor")
|
||||||
if (mentorList.length > 0) {
|
if (mentorList.length > 0) {
|
||||||
for (let index = 0; index < mentorList.length; index++) {
|
for (let index = 0; index < mentorList.length; index++) {
|
||||||
const e = await mentorList[index];
|
const e = await mentorList[index]
|
||||||
|
|
||||||
mentors.push({
|
mentors.push({
|
||||||
personal_id: e.personal_id,
|
personal_id: e.personal_id,
|
||||||
dated: e.dated,
|
dated: e.dated,
|
||||||
name: e.fullname,
|
name: e.fullname,
|
||||||
label:
|
label: e.fullname + " " + (e.position ? `(${e.position}, ${e.posType}: ${e.posLevel})` : ""),
|
||||||
e.fullname + " " + (e.position ? `(${e.position}, ${e.posType}: ${e.posLevel})` : ""),
|
position: e.position,
|
||||||
position: e.position,
|
posType: e.posType,
|
||||||
posType: e.posType,
|
posLevel: e.posLevel,
|
||||||
posLevel: e.posLevel,
|
})
|
||||||
});
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
const commanderData = await (directorData.find((x) => x.role == "commander") ?? null);
|
const commanderData = await (directorData.find(x => x.role == "commander") ?? null)
|
||||||
|
|
||||||
const commander =
|
const commander =
|
||||||
commanderData != null
|
commanderData != null
|
||||||
? {
|
? {
|
||||||
personal_id: commanderData.personal_id,
|
personal_id: commanderData.personal_id,
|
||||||
dated: commanderData.dated,
|
dated: commanderData.dated,
|
||||||
name: commanderData.fullname,
|
name: commanderData.fullname,
|
||||||
label:
|
label: commanderData.fullname + " " + (commanderData.position ? `(${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})` : ""),
|
||||||
commanderData.fullname +
|
position: commanderData.position,
|
||||||
" " +
|
posType: commanderData.posType,
|
||||||
(commanderData.position
|
posLevel: commanderData.posLevel,
|
||||||
? `(${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})`
|
}
|
||||||
: ""),
|
: null
|
||||||
position: commanderData.position,
|
|
||||||
posType: commanderData.posType,
|
|
||||||
posLevel: commanderData.posLevel,
|
|
||||||
}
|
|
||||||
: null;
|
|
||||||
|
|
||||||
const chairmanData = await (directorData.find((x) => x.role == "chairman") ?? null);
|
const chairmanData = await (directorData.find(x => x.role == "chairman") ?? null)
|
||||||
const chairman =
|
const chairman =
|
||||||
chairmanData != null
|
chairmanData != null
|
||||||
? {
|
? {
|
||||||
personal_id: chairmanData.personal_id,
|
personal_id: chairmanData.personal_id,
|
||||||
dated: chairmanData.dated,
|
dated: chairmanData.dated,
|
||||||
name: chairmanData.fullname,
|
name: chairmanData.fullname,
|
||||||
label:
|
label: chairmanData.fullname + " " + (chairmanData.position ? `(${chairmanData.position}, ${chairmanData.posType}: ${chairmanData.posLevel})` : ""),
|
||||||
chairmanData.fullname +
|
position: chairmanData.position,
|
||||||
" " +
|
posType: chairmanData.posType,
|
||||||
(chairmanData.position
|
posLevel: chairmanData.posLevel,
|
||||||
? `(${chairmanData.position}, ${chairmanData.posType}: ${chairmanData.posLevel})`
|
}
|
||||||
: ""),
|
: null
|
||||||
position: chairmanData.position,
|
|
||||||
posType: chairmanData.posType,
|
|
||||||
posLevel: chairmanData.posLevel,
|
|
||||||
}
|
|
||||||
: null;
|
|
||||||
|
|
||||||
return new HttpSuccess({
|
return new HttpSuccess({
|
||||||
commander,
|
commander,
|
||||||
chairman,
|
chairman,
|
||||||
mentors,
|
mentors,
|
||||||
experimentee,
|
experimentee,
|
||||||
assign,
|
assign,
|
||||||
evaluate: evaluate,
|
evaluate: evaluate,
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API บันทึกข้อมูลแบบรายงานการประเมินฯ
|
* API บันทึกข้อมูลแบบรายงานการประเมินฯ
|
||||||
*
|
*
|
||||||
* @summary บันทึกข้อมูลแบบรายงานการประเมินฯ
|
* @summary บันทึกข้อมูลแบบรายงานการประเมินฯ
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Post("")
|
@Post("")
|
||||||
async PostData(
|
async PostData(@Query() assign_id: string, @Body() requestBody: CreateEvaluateResult, @Request() request: RequestWithUser) {
|
||||||
@Query() assign_id: string,
|
await new permission().PermissionUpdate(request, "SYS_PROBATION")
|
||||||
@Body() requestBody: CreateEvaluateResult,
|
|
||||||
@Request() request: RequestWithUser,
|
|
||||||
) {
|
|
||||||
await new permission().PermissionUpdate(request, "SYS_PROBATION");
|
|
||||||
|
|
||||||
const director = await this.assignDirectorRepository.findOne({
|
const director = await this.assignDirectorRepository.findOne({
|
||||||
select: ["personal_id"],
|
select: ["personal_id"],
|
||||||
where: {
|
where: {
|
||||||
assign_id,
|
assign_id,
|
||||||
role: "chairman",
|
role: "chairman",
|
||||||
},
|
},
|
||||||
});
|
})
|
||||||
if (!director) {
|
if (!director) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล")
|
||||||
}
|
}
|
||||||
|
|
||||||
const director_id = director.personal_id;
|
const director_id = director.personal_id
|
||||||
|
|
||||||
const assign = await this.assignRepository.findOne({
|
const assign = await this.assignRepository.findOne({
|
||||||
relations: ["profile"],
|
relations: ["profile"],
|
||||||
where: { id: assign_id },
|
where: { id: assign_id },
|
||||||
});
|
})
|
||||||
if (!assign) {
|
if (!assign) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน")
|
||||||
}
|
}
|
||||||
|
|
||||||
const postData: any = await {
|
const postData: any = await {
|
||||||
assign_id,
|
assign_id,
|
||||||
...requestBody,
|
...requestBody,
|
||||||
director_id,
|
director_id,
|
||||||
no: 1,
|
no: 1,
|
||||||
personal_id: assign.personal_id,
|
personal_id: assign.personal_id,
|
||||||
date_start: requestBody.start_date,
|
date_start: requestBody.start_date,
|
||||||
expand_month: requestBody.pass_result == 3 ? Number(requestBody.expand_month) : 0,
|
expand_month: requestBody.pass_result == 3 ? Number(requestBody.expand_month) : 0,
|
||||||
|
|
||||||
createdUserId: request.user.sub,
|
createdUserId: request.user.sub,
|
||||||
createdFullName: request.user.name,
|
createdFullName: request.user.name,
|
||||||
updateUserId: request.user.sub,
|
updateUserId: request.user.sub,
|
||||||
updateFullName: request.user.name,
|
updateFullName: request.user.name,
|
||||||
};
|
}
|
||||||
|
|
||||||
await this.evaluateResultRepository.save(postData, {
|
await this.evaluateResultRepository.save(postData, {
|
||||||
data: request,
|
data: request,
|
||||||
});
|
})
|
||||||
setLogDataDiff(request, { before: null, after: postData });
|
setLogDataDiff(request, { before: null, after: postData })
|
||||||
|
|
||||||
const personal = await this.personalRepository.findOne({
|
const personal = await this.personalRepository.findOne({
|
||||||
where: { personal_id: assign.personal_id },
|
where: { personal_id: assign.personal_id },
|
||||||
});
|
})
|
||||||
|
|
||||||
if (!personal) {
|
if (!personal) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล")
|
||||||
}
|
}
|
||||||
personal.probation_status =
|
personal.probation_status = requestBody.pass_result == 1 ? 2 : requestBody.pass_result == 2 ? 3 : personal.probation_status
|
||||||
requestBody.pass_result == 1
|
|
||||||
? 2
|
|
||||||
: requestBody.pass_result == 2
|
|
||||||
? 3
|
|
||||||
: personal.probation_status;
|
|
||||||
|
|
||||||
if (requestBody.pass_result == 3) {
|
if (requestBody.pass_result == 3) {
|
||||||
personal.probation_status = 7;
|
personal.probation_status = 7
|
||||||
// #noti ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ กรณีขยายระยะเวลา
|
// #noti ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ กรณีขยายระยะเวลา
|
||||||
await new CallAPI()
|
await new CallAPI()
|
||||||
.PostData(request, "/placement/noti", {
|
.PostData(request, "/placement/noti", {
|
||||||
subject: "ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ",
|
subject: "ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ",
|
||||||
body: `ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ เห็นควรให้ขยายระยะเวลาทดลองปฏิบัติหน้าที่ราชการต่อไปอีก ${requestBody.expand_month} เดือน`,
|
body: `ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ เห็นควรให้ขยายระยะเวลาทดลองปฏิบัติหน้าที่ราชการต่อไปอีก ${requestBody.expand_month} เดือน`,
|
||||||
receiverUserId: assign.personal_id,
|
receiverUserId: assign.personal_id,
|
||||||
payload: "",
|
payload: "",
|
||||||
isSendMail: false,
|
isSendMail: false,
|
||||||
isSendInbox: true,
|
isSendInbox: true,
|
||||||
isSendNotification: true,
|
isSendNotification: true,
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch(error => {
|
||||||
console.error("Error calling API:", error);
|
console.error("Error calling API:", error)
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
await this.personalRepository.save(personal, { data: request });
|
await this.personalRepository.save(personal, { data: request })
|
||||||
|
|
||||||
return new HttpSuccess();
|
return new HttpSuccess()
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API แก้ไขข้อมูลแบบรายงานการประเมินฯ
|
* API แก้ไขข้อมูลแบบรายงานการประเมินฯ
|
||||||
*
|
*
|
||||||
* @summary แก้ไขข้อมูลแบบรายงานการประเมินฯ
|
* @summary แก้ไขข้อมูลแบบรายงานการประเมินฯ
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Put("")
|
@Put("")
|
||||||
async UpdateData(
|
async UpdateData(@Query() assign_id: string, @Query() evaluate_id: string, @Body() requestBody: CreateEvaluateResult, @Request() request: RequestWithUser) {
|
||||||
@Query() assign_id: string,
|
await new permission().PermissionUpdate(request, "SYS_PROBATION")
|
||||||
@Query() evaluate_id: string,
|
|
||||||
@Body() requestBody: CreateEvaluateResult,
|
|
||||||
@Request() request: RequestWithUser,
|
|
||||||
) {
|
|
||||||
await new permission().PermissionUpdate(request, "SYS_PROBATION");
|
|
||||||
|
|
||||||
let evaluate = await this.evaluateResultRepository.findOne({
|
let evaluate = await this.evaluateResultRepository.findOne({
|
||||||
where: { id: evaluate_id },
|
where: { id: evaluate_id },
|
||||||
});
|
})
|
||||||
|
|
||||||
const before = evaluate;
|
const before = evaluate
|
||||||
|
|
||||||
if (!evaluate) {
|
if (!evaluate) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมิน");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมิน")
|
||||||
}
|
}
|
||||||
|
|
||||||
evaluate.date_start = requestBody.start_date;
|
evaluate.date_start = requestBody.start_date
|
||||||
evaluate.date_finish = requestBody.date_finish;
|
evaluate.date_finish = requestBody.date_finish
|
||||||
evaluate.develop_complete = requestBody.develop_complete;
|
evaluate.develop_complete = requestBody.develop_complete
|
||||||
evaluate.pass_result = requestBody.pass_result;
|
evaluate.pass_result = requestBody.pass_result
|
||||||
evaluate.expand_month =
|
evaluate.expand_month = requestBody.pass_result && requestBody.pass_result == 3 ? Number(requestBody.expand_month) : 0
|
||||||
requestBody.pass_result && requestBody.pass_result == 3
|
evaluate.reson = requestBody.reson
|
||||||
? Number(requestBody.expand_month)
|
evaluate.chairman_dated = requestBody.chairman_dated
|
||||||
: 0;
|
|
||||||
evaluate.reson = requestBody.reson;
|
|
||||||
evaluate.chairman_dated = requestBody.chairman_dated;
|
|
||||||
|
|
||||||
evaluate.director1_dated = requestBody.director1_dated;
|
evaluate.director1_dated = requestBody.director1_dated
|
||||||
evaluate.director2_dated = requestBody.director2_dated;
|
evaluate.director2_dated = requestBody.director2_dated
|
||||||
evaluate.updateUserId = request.user.sub;
|
evaluate.updateUserId = request.user.sub
|
||||||
evaluate.updateFullName = request.user.name;
|
evaluate.updateFullName = request.user.name
|
||||||
|
|
||||||
await this.evaluateResultRepository.save(evaluate, { data: request });
|
await this.evaluateResultRepository.save(evaluate, { data: request })
|
||||||
setLogDataDiff(request, { before, after: evaluate });
|
setLogDataDiff(request, { before, after: evaluate })
|
||||||
|
|
||||||
const assign = await this.assignRepository.findOne({
|
const assign = await this.assignRepository.findOne({
|
||||||
relations: ["profile"],
|
relations: ["profile"],
|
||||||
where: { id: assign_id },
|
where: { id: assign_id },
|
||||||
});
|
})
|
||||||
if (!assign) {
|
if (!assign) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน")
|
||||||
}
|
}
|
||||||
const personal = await this.personalRepository.findOne({
|
const personal = await this.personalRepository.findOne({
|
||||||
where: { personal_id: assign.personal_id },
|
where: { personal_id: assign.personal_id },
|
||||||
});
|
})
|
||||||
|
|
||||||
if (!personal) {
|
if (!personal) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล")
|
||||||
}
|
}
|
||||||
personal.probation_status =
|
personal.probation_status = requestBody.pass_result == 1 ? 2 : requestBody.pass_result == 2 ? 3 : personal.probation_status
|
||||||
requestBody.pass_result == 1
|
|
||||||
? 2
|
|
||||||
: requestBody.pass_result == 2
|
|
||||||
? 3
|
|
||||||
: personal.probation_status;
|
|
||||||
|
|
||||||
if (requestBody.pass_result == 3) {
|
if (requestBody.pass_result == 3) {
|
||||||
personal.probation_status = 7;
|
personal.probation_status = 7
|
||||||
// #noti ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ กรณีขยายระยะเวลา
|
// #noti ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ กรณีขยายระยะเวลา
|
||||||
await new CallAPI()
|
await new CallAPI()
|
||||||
.PostData(request, "/placement/noti", {
|
.PostData(request, "/placement/noti", {
|
||||||
subject: "ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ",
|
subject: "ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ",
|
||||||
body: `ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ เห็นควรให้ขยายระยะเวลาทดลองปฏิบัติหน้าที่ราชการต่อไปอีก ${requestBody.expand_month} เดือน`,
|
body: `ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ เห็นควรให้ขยายระยะเวลาทดลองปฏิบัติหน้าที่ราชการต่อไปอีก ${requestBody.expand_month} เดือน`,
|
||||||
receiverUserId: assign.personal_id,
|
receiverUserId: assign.personal_id,
|
||||||
payload: "",
|
payload: "",
|
||||||
isSendMail: false,
|
isSendMail: false,
|
||||||
isSendInbox: true,
|
isSendInbox: true,
|
||||||
isSendNotification: true,
|
isSendNotification: true,
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch(error => {
|
||||||
console.error("Error calling API:", error);
|
console.error("Error calling API:", error)
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
await this.personalRepository.save(personal, { data: request });
|
await this.personalRepository.save(personal, { data: request })
|
||||||
|
|
||||||
return new HttpSuccess();
|
return new HttpSuccess()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,215 +1,166 @@
|
||||||
import {
|
import { Controller, Post, Route, Security, Tags, Body, Request, SuccessResponse, Response, Get, Query } from "tsoa"
|
||||||
Controller,
|
import { AppDataSource } from "../database/data-source"
|
||||||
Post,
|
import HttpSuccess from "../interfaces/http-success"
|
||||||
Route,
|
import HttpStatusCode from "../interfaces/http-status"
|
||||||
Security,
|
import HttpError from "../interfaces/http-error"
|
||||||
Tags,
|
import { RequestWithUser } from "../middlewares/user"
|
||||||
Body,
|
import { setLogDataDiff } from "../interfaces/utils"
|
||||||
Request,
|
import { Personal, PostPersonal } from "../entities/Personal"
|
||||||
SuccessResponse,
|
import permission from "../interfaces/permission"
|
||||||
Response,
|
import { Assign } from "../entities/Assign"
|
||||||
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";
|
|
||||||
|
|
||||||
@Route("api/v1/probation/personal")
|
@Route("api/v1/probation/personal")
|
||||||
@Tags("Personal")
|
@Tags("Personal")
|
||||||
@Security("bearerAuth")
|
@Security("bearerAuth")
|
||||||
@Response(
|
@Response(HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง")
|
||||||
HttpStatusCode.INTERNAL_SERVER_ERROR,
|
|
||||||
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง"
|
|
||||||
)
|
|
||||||
@SuccessResponse(HttpStatusCode.OK, "สำเร็จ")
|
|
||||||
export class PersonalController extends Controller {
|
export class PersonalController extends Controller {
|
||||||
private personalRepository = AppDataSource.getRepository(Personal);
|
private personalRepository = AppDataSource.getRepository(Personal)
|
||||||
private assignRepository = AppDataSource.getRepository(Assign);
|
private assignRepository = AppDataSource.getRepository(Assign)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API ข้อมูลบุคคลในระบบทดลองงาน
|
* API ข้อมูลบุคคลในระบบทดลองงาน
|
||||||
*
|
*
|
||||||
* @summary เพิ่มคนเข้าระบบทดลองงาน
|
* @summary เพิ่มคนเข้าระบบทดลองงาน
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Post("add")
|
@Post("add")
|
||||||
async AddPersonal(
|
async AddPersonal(@Body() requestBody: PostPersonal, @Request() request: RequestWithUser) {
|
||||||
@Body() requestBody: PostPersonal,
|
await new permission().PermissionCreate(request, "SYS_PROBATION")
|
||||||
@Request() request: RequestWithUser
|
|
||||||
) {
|
|
||||||
await new permission().PermissionCreate(request, "SYS_PROBATION");
|
|
||||||
|
|
||||||
const checkPersonal: number = await this.personalRepository.count({
|
const checkPersonal: number = await this.personalRepository.count({
|
||||||
where: { personal_id: requestBody.id },
|
where: { personal_id: requestBody.id },
|
||||||
});
|
})
|
||||||
if (checkPersonal > 0) {
|
if (checkPersonal > 0) {
|
||||||
throw new HttpError(
|
throw new HttpError(HttpStatusCode.BAD_REQUEST, "ผู้ทดลองปฏิบัติหน้าที่ราชการนี้มีอยู่แล้ว")
|
||||||
HttpStatusCode.BAD_REQUEST,
|
}
|
||||||
"ผู้ทดลองปฏิบัติหน้าที่ราชการนี้มีอยู่แล้ว"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
let organization = await (requestBody.orgChild4Name
|
let organization = await (requestBody.orgChild4Name ? requestBody.orgChild4Name + "/" : "")
|
||||||
? requestBody.orgChild4Name + "/"
|
organization += await (requestBody.orgChild3Name ? requestBody.orgChild3Name + "/" : "")
|
||||||
: "");
|
organization += await (requestBody.orgChild2Name ? requestBody.orgChild2Name + "/" : "")
|
||||||
organization += await (requestBody.orgChild3Name
|
organization += await (requestBody.orgChild1Name ? requestBody.orgChild1Name + "/" : "")
|
||||||
? requestBody.orgChild3Name + "/"
|
organization += await (requestBody.orgRootName ? requestBody.orgRootName : "")
|
||||||
: "");
|
|
||||||
organization += await (requestBody.orgChild2Name
|
|
||||||
? requestBody.orgChild2Name + "/"
|
|
||||||
: "");
|
|
||||||
organization += await (requestBody.orgChild1Name
|
|
||||||
? requestBody.orgChild1Name + "/"
|
|
||||||
: "");
|
|
||||||
organization += await (requestBody.orgRootName
|
|
||||||
? requestBody.orgRootName
|
|
||||||
: "");
|
|
||||||
|
|
||||||
const personalData = Object.assign(new Personal());
|
const personalData = Object.assign(new Personal())
|
||||||
personalData.personal_id = requestBody.id;
|
personalData.personal_id = requestBody.id
|
||||||
personalData.order_number = requestBody.order_number
|
personalData.order_number = requestBody.order_number ? requestBody.order_number : ""
|
||||||
? requestBody.order_number
|
personalData.probation_status = 1
|
||||||
: "";
|
personalData.createdUserId = request.user.sub
|
||||||
personalData.probation_status = 1;
|
personalData.createdFullName = request.user.name
|
||||||
personalData.createdUserId = request.user.sub;
|
personalData.updateUserId = request.user.sub
|
||||||
personalData.createdFullName = request.user.name;
|
personalData.updateFullName = request.user.name
|
||||||
personalData.updateUserId = request.user.sub;
|
|
||||||
personalData.updateFullName = request.user.name;
|
|
||||||
|
|
||||||
personalData.idcard = requestBody.idcard;
|
personalData.idcard = requestBody.idcard
|
||||||
personalData.prefixName = requestBody.prefix;
|
personalData.prefixName = requestBody.prefix
|
||||||
personalData.firstName = requestBody.firstName;
|
personalData.firstName = requestBody.firstName
|
||||||
personalData.lastName = requestBody.lastName;
|
personalData.lastName = requestBody.lastName
|
||||||
personalData.isProbation = requestBody.isProbation ? 1 : 0;
|
personalData.isProbation = requestBody.isProbation ? 1 : 0
|
||||||
personalData.positionLevelName = requestBody.posLevelName
|
personalData.positionLevelName = requestBody.posLevelName ? requestBody.posLevelName : ""
|
||||||
? requestBody.posLevelName
|
personalData.positionName = requestBody.position ? requestBody.position : ""
|
||||||
: "";
|
personalData.positionLineName = requestBody.posLineName
|
||||||
personalData.positionName = requestBody.position
|
personalData.positionTypeName = requestBody.posTypeName
|
||||||
? requestBody.position
|
personalData.posNo = requestBody.posNo ? requestBody.posNo : ""
|
||||||
: "";
|
personalData.orgRootName = requestBody.orgRootName
|
||||||
personalData.positionLineName = requestBody.posLineName;
|
personalData.organization = organization
|
||||||
personalData.positionTypeName = requestBody.posTypeName;
|
|
||||||
personalData.posNo = requestBody.posNo ? requestBody.posNo : "";
|
|
||||||
personalData.orgRootName = requestBody.orgRootName;
|
|
||||||
personalData.organization = organization;
|
|
||||||
|
|
||||||
const before = null;
|
const before = null
|
||||||
const personal = await this.personalRepository.save(personalData, {
|
const personal = await this.personalRepository.save(personalData, {
|
||||||
data: request,
|
data: request,
|
||||||
});
|
})
|
||||||
setLogDataDiff(request, { before, after: personal });
|
setLogDataDiff(request, { before, after: personal })
|
||||||
|
|
||||||
return new HttpSuccess();
|
return new HttpSuccess()
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API รายการบุคคลในระบบทดลองงาน
|
* API รายการบุคคลในระบบทดลองงาน
|
||||||
*
|
*
|
||||||
* @summary รายชื่อคนที่อยู่ในระบบทดลองงาน
|
* @summary รายชื่อคนที่อยู่ในระบบทดลองงาน
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Get("list")
|
@Get("list")
|
||||||
async ListPersonal(
|
async ListPersonal(@Query() status: string = "", @Query("page") page: number = 1, @Query("pageSize") pageSize: number = 10, @Request() request: RequestWithUser) {
|
||||||
@Query() status: string = "",
|
await new permission().PermissionList(request, "SYS_PROBATION")
|
||||||
@Query("page") page: number = 1,
|
const conditions: any = {}
|
||||||
@Query("pageSize") pageSize: number = 10,
|
if (status) {
|
||||||
@Request() request: RequestWithUser
|
conditions.probation_status = status
|
||||||
) {
|
}
|
||||||
await new permission().PermissionList(request, "SYS_PROBATION");
|
|
||||||
const conditions: any = {};
|
|
||||||
if (status) {
|
|
||||||
conditions.probation_status = status;
|
|
||||||
}
|
|
||||||
|
|
||||||
const [lists, total] = await this.personalRepository.findAndCount({
|
const [lists, total] = await this.personalRepository.findAndCount({
|
||||||
order: { createdAt: "DESC" },
|
order: { createdAt: "DESC" },
|
||||||
where: conditions,
|
where: conditions,
|
||||||
skip: (page - 1) * pageSize,
|
skip: (page - 1) * pageSize,
|
||||||
take: pageSize,
|
take: pageSize,
|
||||||
});
|
})
|
||||||
|
|
||||||
if (!lists) {
|
if (!lists) {
|
||||||
throw new HttpError(
|
throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, "ไม่สามารถแสดงข้อมูลได้")
|
||||||
HttpStatusCode.INTERNAL_SERVER_ERROR,
|
}
|
||||||
"ไม่สามารถแสดงข้อมูลได้"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
let result: any = [];
|
let result: any = []
|
||||||
|
|
||||||
await Promise.all(
|
await Promise.all(
|
||||||
lists.map(async (item, index) => {
|
lists.map(async (item, index) => {
|
||||||
const probation_no = await this.assignRepository.count({
|
const probation_no = await this.assignRepository.count({
|
||||||
where: {
|
where: {
|
||||||
personal_id: item.personal_id,
|
personal_id: item.personal_id,
|
||||||
},
|
},
|
||||||
});
|
})
|
||||||
|
|
||||||
await result.push({
|
await result.push({
|
||||||
personal_id: item.personal_id,
|
personal_id: item.personal_id,
|
||||||
ordering: index + 1,
|
ordering: index + 1,
|
||||||
name: item.prefixName + item.firstName + " " + item.lastName,
|
name: item.prefixName + item.firstName + " " + item.lastName,
|
||||||
idcard: item.idcard,
|
idcard: item.idcard,
|
||||||
prefixName: item.prefixName,
|
prefixName: item.prefixName,
|
||||||
firstName: item.firstName,
|
firstName: item.firstName,
|
||||||
lastName: item.lastName,
|
lastName: item.lastName,
|
||||||
position_line: item.positionName,
|
position_line: item.positionName,
|
||||||
position_level: item.positionLevelName,
|
position_level: item.positionLevelName,
|
||||||
position_type: item.positionTypeName,
|
position_type: item.positionTypeName,
|
||||||
organization: item.organization,
|
organization: item.organization,
|
||||||
probation_no: probation_no,
|
probation_no: probation_no,
|
||||||
order_number: item.order_number,
|
order_number: item.order_number,
|
||||||
probation_status: item.probation_status,
|
probation_status: item.probation_status,
|
||||||
});
|
})
|
||||||
})
|
})
|
||||||
);
|
)
|
||||||
|
|
||||||
return new HttpSuccess({ data: result, total: total });
|
return new HttpSuccess({ data: result, total: total })
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API ข้อมูลบุคคลในระบบทดลองงาน
|
* API ข้อมูลบุคคลในระบบทดลองงาน
|
||||||
*
|
*
|
||||||
* @summary ข้อมูลคนที่อยูาในระบบทดลองงาน
|
* @summary ข้อมูลคนที่อยูาในระบบทดลองงาน
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Get("")
|
@Get("")
|
||||||
async GetPersonal(
|
async GetPersonal(@Request() request: RequestWithUser, @Query() personal_id: string) {
|
||||||
@Request() request: RequestWithUser,
|
await new permission().PermissionGet(request, "SYS_PROBATION")
|
||||||
@Query() personal_id: string
|
const person = await this.personalRepository.findOne({
|
||||||
) {
|
where: { personal_id: personal_id },
|
||||||
await new permission().PermissionGet(request, "SYS_PROBATION");
|
})
|
||||||
const person = await this.personalRepository.findOne({
|
|
||||||
where: { personal_id: personal_id },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!person) {
|
if (!person) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล")
|
||||||
}
|
}
|
||||||
|
|
||||||
const probation_no = await this.assignRepository.count({
|
const probation_no = await this.assignRepository.count({
|
||||||
where: { personal_id: person.personal_id },
|
where: { personal_id: person.personal_id },
|
||||||
});
|
})
|
||||||
|
|
||||||
const result = await {
|
const result = await {
|
||||||
personal_id: person.personal_id,
|
personal_id: person.personal_id,
|
||||||
name: person.prefixName + person.firstName + " " + person.lastName,
|
name: person.prefixName + person.firstName + " " + person.lastName,
|
||||||
position_line: person.positionName,
|
position_line: person.positionName,
|
||||||
position_level: person.positionLevelName,
|
position_level: person.positionLevelName,
|
||||||
position_type: person.positionTypeName,
|
position_type: person.positionTypeName,
|
||||||
organization: person.organization,
|
organization: person.organization,
|
||||||
probation_no: probation_no,
|
probation_no: probation_no,
|
||||||
order_number: person.order_number,
|
order_number: person.order_number,
|
||||||
probation_status: person.probation_status,
|
probation_status: person.probation_status,
|
||||||
};
|
}
|
||||||
|
|
||||||
return new HttpSuccess(result);
|
return new HttpSuccess(result)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,6 @@ import { Appoint } from "../entities/Appoint"
|
||||||
@Tags("Report")
|
@Tags("Report")
|
||||||
@Security("bearerAuth")
|
@Security("bearerAuth")
|
||||||
@Response(HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง")
|
@Response(HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง")
|
||||||
@SuccessResponse(HttpStatusCode.OK, "สำเร็จ")
|
|
||||||
export class ReportController extends Controller {
|
export class ReportController extends Controller {
|
||||||
private evaluateChairmanRepository = AppDataSource.getRepository(EvaluateChairman)
|
private evaluateChairmanRepository = AppDataSource.getRepository(EvaluateChairman)
|
||||||
private evaluateResultRepository = AppDataSource.getRepository(EvaluateResult)
|
private evaluateResultRepository = AppDataSource.getRepository(EvaluateResult)
|
||||||
|
|
|
||||||
|
|
@ -1,67 +1,47 @@
|
||||||
import {
|
import { Controller, Route, Security, Tags, Request, SuccessResponse, Response, Get, Post, Body, Query } from "tsoa"
|
||||||
Controller,
|
import HttpSuccess from "../interfaces/http-success"
|
||||||
Route,
|
import HttpStatusCode from "../interfaces/http-status"
|
||||||
Security,
|
import { RequestWithUser } from "../middlewares/user"
|
||||||
Tags,
|
import { setLogDataDiff } from "../interfaces/utils"
|
||||||
Request,
|
import { Survey } from "../entities/Survey"
|
||||||
SuccessResponse,
|
import { AppDataSource } from "../database/data-source"
|
||||||
Response,
|
|
||||||
Get,
|
|
||||||
Post,
|
|
||||||
Body,
|
|
||||||
Query,
|
|
||||||
} from "tsoa";
|
|
||||||
import HttpSuccess from "../interfaces/http-success";
|
|
||||||
import HttpStatusCode from "../interfaces/http-status";
|
|
||||||
import { RequestWithUser } from "../middlewares/user";
|
|
||||||
import { setLogDataDiff } from "../interfaces/utils";
|
|
||||||
import { Survey } from "../entities/Survey";
|
|
||||||
import { AppDataSource } from "../database/data-source";
|
|
||||||
|
|
||||||
@Route("api/v1/probation/survey")
|
@Route("api/v1/probation/survey")
|
||||||
@Tags("Survey")
|
@Tags("Survey")
|
||||||
@Security("bearerAuth")
|
@Security("bearerAuth")
|
||||||
@Response(
|
@Response(HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง")
|
||||||
HttpStatusCode.INTERNAL_SERVER_ERROR,
|
|
||||||
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง",
|
|
||||||
)
|
|
||||||
@SuccessResponse(HttpStatusCode.OK, "สำเร็จ")
|
|
||||||
export class SurveyController extends Controller {
|
export class SurveyController extends Controller {
|
||||||
private surveyRepository = AppDataSource.getRepository(Survey);
|
private surveyRepository = AppDataSource.getRepository(Survey)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API แบบสำรวจความคิดเห็น
|
* API แบบสำรวจความคิดเห็น
|
||||||
*
|
*
|
||||||
* @summary แบบสำรวจความคิดเห็น
|
* @summary แบบสำรวจความคิดเห็น
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Get("")
|
@Get("")
|
||||||
async GetSurvey(@Query() assign_id: string) {
|
async GetSurvey(@Query() assign_id: string) {
|
||||||
const data = await this.surveyRepository.findOne({
|
const data = await this.surveyRepository.findOne({
|
||||||
where: {
|
where: {
|
||||||
assign_id,
|
assign_id,
|
||||||
},
|
},
|
||||||
});
|
})
|
||||||
return new HttpSuccess(data);
|
return new HttpSuccess(data)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API บันทึกแบบสำรวจความคิดเห็น
|
* API บันทึกแบบสำรวจความคิดเห็น
|
||||||
*
|
*
|
||||||
* @summary บันทึกแบบสำรวจความคิดเห็น
|
* @summary บันทึกแบบสำรวจความคิดเห็น
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Post("")
|
@Post("")
|
||||||
async PostSurvey(
|
async PostSurvey(@Query() assign_id: string, @Body() requestBody: any, @Request() request: RequestWithUser) {
|
||||||
@Query() assign_id: string,
|
const before = null
|
||||||
@Body() requestBody: any,
|
const data = await { ...requestBody, personal_id: request.user.sub, assign_id }
|
||||||
@Request() request: RequestWithUser,
|
await this.surveyRepository.save(data, { data: request })
|
||||||
) {
|
setLogDataDiff(request, { before, after: data })
|
||||||
const before = null;
|
|
||||||
const data = await { ...requestBody, personal_id: request.user.sub, assign_id };
|
|
||||||
await this.surveyRepository.save(data, { data: request });
|
|
||||||
setLogDataDiff(request, { before, after: data });
|
|
||||||
|
|
||||||
return new HttpSuccess();
|
return new HttpSuccess()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue