null กรรมการ

This commit is contained in:
DESKTOP-2S5P7D1\Windows 10 2024-11-12 14:09:16 +07:00
parent b21e16f215
commit ac28c1c36f
2 changed files with 143 additions and 171 deletions

View file

@ -1,204 +1,176 @@
import { import { Controller, Route, Security, Tags, Body, Request, SuccessResponse, Response, Get, Put, Post, Path, Delete, Query } from "tsoa"
Controller, import { setLogDataDiff } from "../interfaces/utils"
Route,
Security,
Tags,
Body,
Request,
SuccessResponse,
Response,
Get,
Put,
Post,
Path,
Delete,
Query,
} 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,
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง",
)
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( async GetList(@Query() keyword: string = "", @Query("page") page: number = 1, @Query("pageSize") pageSize: number = 10, @Request() request: RequestWithUser) {
@Query() keyword: string = "", await new permission().PermissionList(request, "SYS_PROBATION")
@Query("page") page: number = 1, const _data = await new permission().PermissionOrgList(request, "SYS_PROBATION")
@Query("pageSize") pageSize: number = 10,
@Request() request: RequestWithUser,
) {
await new permission().PermissionList(request, "SYS_PROBATION");
const _data = await new permission().PermissionOrgList(request, "SYS_PROBATION");
const conditions: any = {}; const conditions: any = {}
if (_data.root != undefined && _data.root != null && _data.root[0] != null) { if (_data.root != undefined && _data.root != null && _data.root[0] != null) {
conditions.root = _data.root; conditions.root = _data.root
} }
if (_data.child1 != undefined && _data.child1 != null && _data.child1[0] != null) { if (_data.child1 != undefined && _data.child1 != null && _data.child1[0] != null) {
conditions.child1 = _data.child1; conditions.child1 = _data.child1
} }
if (_data.child2 != undefined && _data.child2 != null && _data.child2[0] != null) { if (_data.child2 != undefined && _data.child2 != null && _data.child2[0] != null) {
conditions.child2 = _data.child2; conditions.child2 = _data.child2
} }
if (_data.child3 != undefined && _data.child3 != null && _data.child3[0] != null) { if (_data.child3 != undefined && _data.child3 != null && _data.child3[0] != null) {
conditions.child3 = _data.child3; conditions.child3 = _data.child3
} }
if (_data.child4 != undefined && _data.child4 != null && _data.child4[0] != null) { if (_data.child4 != undefined && _data.child4 != null && _data.child4[0] != null) {
conditions.child4 = _data.child4; conditions.child4 = _data.child4
} }
const appoint = await this.appointRepository.find({ const appoint = await this.appointRepository.find({
relations: ["personal"], relations: ["personal"],
where: { personal: conditions }, where: { personal: conditions },
}); })
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) {
let _workflow = await new permission().Workflow(request, id, "SYS_PROBATION"); let _workflow = await new permission().Workflow(request, id, "SYS_PROBATION")
if (_workflow == false) await new permission().PermissionGet(request, "SYS_PROBATION"); if (_workflow == false) 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 })
const directors: any = await requestBody.persons.map((x: Person) => ({
...x,
appointId: id,
createdUserId: request.user.sub,
createdFullName: request.user.name,
updateUserId: request.user.sub,
updateFullName: request.user.name,
}))
await this.appointDirectorRepository.save(directors)
await this.appointDirectorRepository.delete({ appointId: id }); await this.appointRepository.save(appoint, { data: request })
const directors = await requestBody.persons.map((x: Person) => ({ setLogDataDiff(request, { before, after: appoint })
...x,
appointId: id,
createdUserId: request.user.sub,
createdFullName: request.user.name,
updateUserId: request.user.sub,
updateFullName: request.user.name,
}));
await this.appointDirectorRepository.save(directors);
await this.appointRepository.save(appoint, { data: request }); return new HttpSuccess()
setLogDataDiff(request, { before, after: appoint }); }
return new HttpSuccess(); /**
} * API
*
* @summary
*
*/
@Delete("{id}")
public async deleteRole(@Path() id: string, @Request() request: RequestWithUser) {
await new permission().PermissionDelete(request, "SYS_PROBATION")
/** await this.appointDirectorRepository.delete({ appointId: id })
* API
*
* @summary
*
*/
@Delete("{id}")
public async deleteRole(@Path() id: string, @Request() request: RequestWithUser) {
await new permission().PermissionDelete(request, "SYS_PROBATION");
await this.appointDirectorRepository.delete({ appointId: id }); const result = await this.appointRepository.delete({ id })
if (!result) throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล")
const result = await this.appointRepository.delete({ id }); return new HttpSuccess()
if (!result) throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล"); }
return new HttpSuccess();
}
} }

View file

@ -52,11 +52,11 @@ export class CreateAppoint {
export type Person = { export type Person = {
profileId: string profileId: string
name?: string | null name: string | null
position?: string | null position?: string | null
positionType?: string | null positionType?: string | null
positionLevel?: string | null positionLevel?: string | null
role?: string | null role: string | null
posNo?: string | null posNo?: string | null
actFullName?: string | null actFullName?: string | null
} }