diff --git a/src/controllers/SalaryController.ts b/src/controllers/SalaryController.ts index 6801cf6..6b7f500 100644 --- a/src/controllers/SalaryController.ts +++ b/src/controllers/SalaryController.ts @@ -4,7 +4,6 @@ import { Post, Put, Delete, - Patch, Route, Security, Tags, @@ -18,12 +17,11 @@ import { Salarys, CreateSalary, UpdateSalary } from "../entities/Salarys"; import { PosType } from "../entities/PosType"; import { PosLevel } from "../entities/PosLevel"; import { AppDataSource } from "../database/data-source"; -import { DeepPartial, In, IsNull, Not } from "typeorm"; +import { Not } from "typeorm"; import HttpSuccess from "../interfaces/http-success"; import HttpError from "../interfaces/http-error"; import HttpStatusCode from "../interfaces/http-status"; import { SalaryRanks } from "../entities/SalaryRanks"; -import { query } from "express"; import { randomUUID } from "crypto"; @Route("api/v1/salary") @@ -56,7 +54,6 @@ export class Salary extends Controller { @Body() requestBody: CreateSalary, @Request() request: { user: Record }, ) { - // try { const salarys = Object.assign(new Salarys(), requestBody); if (!salarys) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล"); @@ -78,7 +75,6 @@ export class Salary extends Controller { const chk_3fields = await this.salaryRepository.findOne({ where: { - name: salarys.name, posTypeId: salarys.posTypeId, posLevelId: salarys.posLevelId, }, @@ -94,9 +90,6 @@ export class Salary extends Controller { salarys.lastUpdateFullName = request.user.name; await this.salaryRepository.save(salarys); return new HttpSuccess(salarys.id); - // } catch (error: any) { - // throw new Error(error); - // } } /** @@ -122,7 +115,6 @@ export class Salary extends Controller { @Body() requestBody: UpdateSalary, @Request() request: { user: Record }, ) { - // try { const chk_Salary = await this.salaryRepository.findOne({ where: { id: id }, }); @@ -147,7 +139,7 @@ export class Salary extends Controller { }); if (chk_3fields.length > 0 && requestBody.isActive) { - chk_3fields.forEach(async (item) => { + chk_3fields.forEach(async (item) => { item.isActive = false; item.lastUpdateUserId = request.user.sub; item.lastUpdateFullName = request.user.name; @@ -177,9 +169,6 @@ export class Salary extends Controller { this.salaryRepository.merge(chk_Salary, mergeData); await this.salaryRepository.save(chk_Salary); return new HttpSuccess(id); - // } catch (error: any) { - // throw new Error(error); - // } } /** @@ -191,7 +180,6 @@ export class Salary extends Controller { */ @Delete("{id}") async delete_salary(@Path() id: string) { - // try { const chk_Salary = await this.salaryRepository.findOne({ where: { id: id }, }); @@ -210,9 +198,6 @@ export class Salary extends Controller { await this.salaryRankRepository.remove(del_SalaryRank); await this.salaryRepository.remove(chk_Salary); return new HttpSuccess(); - // } catch (error: any) { - // throw new Error(error); - // } } /** @@ -234,7 +219,6 @@ export class Salary extends Controller { detail: "string", //คำอธิบาย }) async GetSalaryById(@Path() id: string) { - // try { const salary = await this.salaryRepository.findOne({ where: { id: id }, select: [ @@ -253,9 +237,6 @@ export class Salary extends Controller { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผังเงินเดือนนี้"); } return new HttpSuccess(salary); - // } catch (error: any) { - // throw new Error(error); - // } } /** @@ -273,13 +254,12 @@ export class Salary extends Controller { const [salary, total] = await this.salaryRepository.findAndCount({ relations: ["posLevel_", "posType_"], order: { - // startDate: "DESC", isActive: "DESC", posType_: { - posTypeRank: "DESC" + posTypeRank: "DESC", }, posLevel_: { - posLevelRank: "DESC" + posLevelRank: "DESC", }, }, ...(keyword ? {} : { skip: (page - 1) * pageSize, take: pageSize }), diff --git a/src/controllers/SalaryEmployeeController.ts b/src/controllers/SalaryEmployeeController.ts new file mode 100644 index 0000000..2d722e0 --- /dev/null +++ b/src/controllers/SalaryEmployeeController.ts @@ -0,0 +1,287 @@ +import { + Controller, + Get, + Post, + Put, + Delete, + Route, + Security, + Tags, + Body, + Path, + Request, + Example, + Query, +} from "tsoa"; +import { + SalaryEmployees, + CreateSalaryEmployee, + UpdateSalaryEmployee, +} from "../entities/SalaryEmployees"; +import { AppDataSource } from "../database/data-source"; +import { Not } from "typeorm"; +import HttpSuccess from "../interfaces/http-success"; +import HttpError from "../interfaces/http-error"; +import HttpStatusCode from "../interfaces/http-status"; +import { SalaryRankEmployees } from "../entities/SalaryRankEmployees"; +import { randomUUID } from "crypto"; + +@Route("api/v1/salary") +@Tags("Salary") +@Security("bearerAuth") +export class Salary extends Controller { + private salaryEmployeeRepository = AppDataSource.getRepository(SalaryEmployees); + private salaryRankEmployeeRepository = AppDataSource.getRepository(SalaryRankEmployees); + + /** + * API สร้างผังเงินเดือนลูกจ้าง + * + * + */ + @Post() + @Example({ + name: "string", //*ชื่อผัง + group: "string", //*กลุ่มผัง + isActive: "boolean", //*สถานะการใช้งาน + date: "datetime", //ให้ไว้ ณ วันที่ + startDate: "datetime", //วันที่มีผลบังคับใช้ + endDate: "datetime", //วันที่สิ้นสุดบังคับใช้ + detail: "string", //คำอธิบาย + }) + async create_salary( + @Body() requestBody: CreateSalaryEmployee, + @Request() request: { user: Record }, + ) { + const salarys = Object.assign(new SalaryEmployees(), requestBody); + if (!salarys) { + throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล"); + } + + const chk_3fields = await this.salaryEmployeeRepository.findOne({ + where: { + group: salarys.group, + }, + }); + if (chk_3fields && salarys.isActive) { + salarys.isActive = false; + } + salarys.createdUserId = request.user.sub; + salarys.createdFullName = request.user.name; + salarys.lastUpdateUserId = request.user.sub; + salarys.lastUpdateFullName = request.user.name; + await this.salaryEmployeeRepository.save(salarys); + return new HttpSuccess(salarys.id); + } + + /** + * API แก้ไขผังเงินเดือนลูกจ้าง + * + * + * @param {string} id Guid, *Id ผังเงินเดือน + */ + @Put("{id}") + @Example({ + name: "string", //*ชื่อผัง + group: "string", //*กลุ่มผัง + isActive: "boolean", //*สถานะการใช้งาน + date: "datetime", //ให้ไว้ ณ วันที่ + startDate: "datetime", //วันที่มีผลบังคับใช้ + endDate: "datetime", //วันที่สิ้นสุดบังคับใช้ + detail: "string", //คำอธิบาย + }) + async update_salary( + @Path() id: string, + @Body() requestBody: UpdateSalaryEmployee, + @Request() request: { user: Record }, + ) { + const chk_Salary = await this.salaryEmployeeRepository.findOne({ + where: { id: id }, + }); + if (!chk_Salary) { + throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผังเงินเดือนนี้"); + } + + if (chk_Salary.isActive && !requestBody.isActive) { + throw new HttpError( + HttpStatusCode.NOT_FOUND, + "ไม่สามารถแก้ไขสถานะการใช้งานที่เป็น Default ได้", + ); + } + + const chk_3fields = await this.salaryEmployeeRepository.find({ + where: { + group: requestBody.group, + isActive: true, + id: Not(id), + }, + }); + + if (chk_3fields.length > 0 && requestBody.isActive) { + chk_3fields.forEach(async (item) => { + item.isActive = false; + item.lastUpdateUserId = request.user.sub; + item.lastUpdateFullName = request.user.name; + item.lastUpdatedAt = new Date(); + await this.salaryEmployeeRepository.save(chk_3fields); + }); + } + + const mergeData = Object.assign(new SalaryEmployees(), requestBody); + + chk_Salary.lastUpdateUserId = request.user.sub; + chk_Salary.lastUpdateFullName = request.user.name; + chk_Salary.lastUpdatedAt = new Date(); + this.salaryEmployeeRepository.merge(chk_Salary, mergeData); + await this.salaryEmployeeRepository.save(chk_Salary); + return new HttpSuccess(id); + } + + /** + * API ลบผังเงินเดือนลูกจ้าง + * + * + * @param {string} id Guid, *Id ผังเงินเดือน + */ + @Delete("{id}") + async delete_salary(@Path() id: string) { + const chk_Salary = await this.salaryEmployeeRepository.findOne({ + where: { id: id }, + }); + if (!chk_Salary) { + throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผังเงินเดือนนี้"); + } + if (chk_Salary.isActive) { + throw new HttpError( + HttpStatusCode.NOT_FOUND, + "ไม่สามารถลบข้อมูลนี้ได้ เนื่องจากเปิดใช้งานอยู่", + ); + } + const del_SalaryRank = await this.salaryRankEmployeeRepository.find({ + where: { salaryEmployeeId: chk_Salary.id }, + }); + await this.salaryRankEmployeeRepository.remove(del_SalaryRank); + await this.salaryEmployeeRepository.remove(chk_Salary); + return new HttpSuccess(); + } + + /** + * API รายละเอียดผังเงินเดือนลูกจ้าง + * + * + * @param {string} id Guid, *Id ผังเงินเดือน + */ + @Get("{id}") + @Example({ + name: "string", //*ชื่อผัง + group: "string", //*กลุ่มผัง + isActive: "boolean", //*สถานะการใช้งาน + date: "datetime", //ให้ไว้ ณ วันที่ + startDate: "datetime", //วันที่มีผลบังคับใช้ + endDate: "datetime", //วันที่สิ้นสุดบังคับใช้ + detail: "string", //คำอธิบาย + }) + async GetSalaryById(@Path() id: string) { + const salary = await this.salaryEmployeeRepository.findOne({ + where: { id: id }, + select: ["name", "group", "isActive", "date", "startDate", "endDate", "details"], + }); + if (!salary) { + throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผังเงินเดือนนี้"); + } + return new HttpSuccess(salary); + } + + /** + * API รายการผังเงินเดือนลูกจ้าง + * + * + */ + @Get() + async listSalary( + @Query("page") page: number = 1, + @Query("pageSize") pageSize: number = 10, + @Query("keyword") keyword?: string, + ) { + const [salary, total] = await this.salaryEmployeeRepository.findAndCount({ + order: { + isActive: "DESC", + group: "ASC", + }, + ...(keyword ? {} : { skip: (page - 1) * pageSize, take: pageSize }), + }); + if (keyword != undefined && keyword !== "") { + const filteredSalary = salary.filter( + (x) => + x.name?.toString().includes(keyword) || + x.group?.toString().includes(keyword) || + x.isActive?.toString().includes(keyword) || + x.date?.toString().includes(keyword) || + x.startDate?.toString().includes(keyword) || + x.endDate?.toString().includes(keyword) || + x.details?.toString().includes(keyword), + ); + + const formattedData = filteredSalary.map((item) => ({ + id: item.id, + name: item.name, + group: item.group, + isActive: item.isActive, + date: item.date, + startDate: item.startDate, + endDate: item.endDate, + details: item.details, + })); + const slicedData = formattedData.slice((page - 1) * pageSize, page * pageSize); + return new HttpSuccess({ data: slicedData, total: formattedData.length }); + } + + const formattedData = salary.map((item) => ({ + id: item.id, + name: item.name, + group: item.group, + isActive: item.isActive, + date: item.date, + startDate: item.startDate, + endDate: item.endDate, + details: item.details, + })); + return new HttpSuccess({ data: formattedData, total }); + } + + /** + * API copy ผังเงินเดือนลูกจ้าง + * + * + */ + @Post("copy") + async copySalary( + @Body() body: { id: string }, + @Request() request: { user: Record }, + ) { + const salary = await this.salaryEmployeeRepository.findOne({ + relations: ["salaryRankEmployees_"], + where: { id: body.id }, + }); + + if (!salary) { + throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผังเงินเดือนนี้"); + } + + const salaryRank = await this.salaryRankEmployeeRepository.find({ + where: { salaryEmployeeId: salary?.id }, + }); + + const newSalary = { ...salary, id: randomUUID(), isActive: false }; + + await this.salaryEmployeeRepository.save(newSalary); + + await Promise.all( + salaryRank.map(async (v) => { + const newSalaryRank = { ...v, id: randomUUID() }; + await this.salaryRankEmployeeRepository.save(newSalaryRank); + }), + ); + + return new HttpSuccess({ id: newSalary.id }); + } +} diff --git a/src/controllers/SalaryRankController.ts b/src/controllers/SalaryRankController.ts index 0de9663..5b48ec4 100644 --- a/src/controllers/SalaryRankController.ts +++ b/src/controllers/SalaryRankController.ts @@ -19,7 +19,6 @@ import HttpSuccess from "../interfaces/http-success"; import HttpStatusCode from "../interfaces/http-status"; import HttpError from "../interfaces/http-error"; import { CreateSalaryRank, SalaryRanks, UpdateSalaryRank } from "../entities/SalaryRanks"; -import { Not } from "typeorm"; import { Salarys } from "../entities/Salarys"; @Route("api/v1/salary/rate") @Tags("SalaryRank") @@ -50,10 +49,7 @@ export class SalaryRanksController extends Controller { where: { id: requestBody.salaryId }, }); if (!checkSalary) { - throw new HttpError( - HttpStatusCode.NOT_FOUND, - "ไม่พบข้อมูลผังเงินเดือนนี้" - ); + throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผังเงินเดือนนี้"); } const salaryRank = Object.assign(new SalaryRanks(), requestBody); salaryRank.createdUserId = request.user.sub; @@ -81,7 +77,6 @@ export class SalaryRanksController extends Controller { requestBody: UpdateSalaryRank, @Request() request: { user: Record }, ) { - // try { const salaryRank = await this.salaryRankRepository.findOne({ where: { id: id } }); if (!salaryRank) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลระดับผังเงินเดือนนี้"); @@ -91,9 +86,6 @@ export class SalaryRanksController extends Controller { this.salaryRankRepository.merge(salaryRank, requestBody); await this.salaryRankRepository.save(salaryRank); return new HttpSuccess(); - // } catch (error: any) { - // throw new Error(error); - // } } /** @@ -105,7 +97,6 @@ export class SalaryRanksController extends Controller { */ @Delete("{id}") async deleteSalaryRanks(@Path() id: string) { - // try { const delSalaryRanks = await this.salaryRankRepository.findOne({ where: { id }, }); @@ -114,34 +105,8 @@ export class SalaryRanksController extends Controller { } await this.salaryRankRepository.delete({ id: id }); return new HttpSuccess(); - // } catch (error: any) { - // throw new Error(error); - // } } - // /** - // * API รายละเอียดรายการอัตราเงินเดือน - // * - // * @summary ORG_059 - รายละเอียดรายการอัตราเงินเดือน (ADMIN) #65 - // * - // * @param {string} id Id อัตราเงินเดือน - // */ - // @Get("{id}") - // async detailSalaryRanks(@Path() id: string) { - // const salaryRank = await this.salaryRankRepository.findOne({ - // where: { id }, - // select: ["id"], - // }); - // if (!salaryRank) { - // throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล"); - // } - // try { - // return new HttpSuccess(salaryRank); - // } catch (error) { - // return error; - // } - // } - /** * API รายการอัตราเงินเดือน * @@ -156,7 +121,6 @@ export class SalaryRanksController extends Controller { @Query("pageSize") pageSize: number = 10, @Query("keyword") keyword?: string, ) { - const [salaryRank, total] = await this.salaryRankRepository.findAndCount({ where: { salaryId: id, diff --git a/src/controllers/SalaryRankEmployeeController.ts b/src/controllers/SalaryRankEmployeeController.ts new file mode 100644 index 0000000..8579ad0 --- /dev/null +++ b/src/controllers/SalaryRankEmployeeController.ts @@ -0,0 +1,149 @@ +import { + Controller, + Post, + Put, + Delete, + Route, + Security, + Tags, + Body, + Path, + Request, + SuccessResponse, + Response, + Get, + Query, +} from "tsoa"; +import { AppDataSource } from "../database/data-source"; +import HttpSuccess from "../interfaces/http-success"; +import HttpStatusCode from "../interfaces/http-status"; +import HttpError from "../interfaces/http-error"; +import { + CreateSalaryRankEmployee, + SalaryRankEmployees, + UpdateSalaryRankEmployee, +} from "../entities/SalaryRankEmployees"; +import { Salarys } from "../entities/Salarys"; +@Route("api/v1/salary/rate") +@Tags("SalaryRankEmployee") +@Security("bearerAuth") +@Response( + HttpStatusCode.INTERNAL_SERVER_ERROR, + "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", +) +@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") +export class SalaryRankEmployeesController extends Controller { + private salaryRankEmployeeRepository = AppDataSource.getRepository(SalaryRankEmployees); + private salaryRepository = AppDataSource.getRepository(Salarys); + + /** + * API สร้างอัตราเงินเดือนลูกจ้าง + * + * + */ + @Post() + async CreateSalaryRankEmployee( + @Body() + requestBody: CreateSalaryRankEmployee, + @Request() request: { user: Record }, + ) { + try { + const checkSalary = await this.salaryRepository.findOne({ + where: { id: requestBody.salaryEmployeeId }, + }); + if (!checkSalary) { + throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผังเงินเดือนนี้"); + } + const salaryRankEmployee = Object.assign(new SalaryRankEmployees(), requestBody); + salaryRankEmployee.createdUserId = request.user.sub; + salaryRankEmployee.createdFullName = request.user.name; + salaryRankEmployee.lastUpdateUserId = request.user.sub; + salaryRankEmployee.lastUpdateFullName = request.user.name; + await this.salaryRankEmployeeRepository.save(salaryRankEmployee); + return new HttpSuccess(); + } catch (error: any) { + throw new Error(error); + } + } + + /** + * API แก้ไขอัตราเงินเดือนลูกจ้าง + * + * + * @param {string} id Id อัตราเงินเดือน + */ + @Put("{id}") + async updateSalaryRankEmployees( + @Path() id: string, + @Body() + requestBody: UpdateSalaryRankEmployee, + @Request() request: { user: Record }, + ) { + const salaryRankEmployee = await this.salaryRankEmployeeRepository.findOne({ + where: { id: id }, + }); + if (!salaryRankEmployee) { + throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลระดับผังเงินเดือนนี้"); + } + salaryRankEmployee.lastUpdateUserId = request.user.sub; + salaryRankEmployee.lastUpdateFullName = request.user.name; + this.salaryRankEmployeeRepository.merge(salaryRankEmployee, requestBody); + await this.salaryRankEmployeeRepository.save(salaryRankEmployee); + return new HttpSuccess(); + } + + /** + * API ลบอัตราเงินเดือนลูกจ้าง + * + * + * @param {string} id Id อัตราเงินเดือน + */ + @Delete("{id}") + async deleteSalaryRankEmployees(@Path() id: string) { + const delSalaryRankEmployees = await this.salaryRankEmployeeRepository.findOne({ + where: { id }, + }); + if (!delSalaryRankEmployees) { + throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลระดับผังเงินเดือนนี้"); + } + await this.salaryRankEmployeeRepository.delete({ id: id }); + return new HttpSuccess(); + } + + /** + * API รายการอัตราเงินเดือนลูกจ้าง + * + * + * @param {string} id Id ผังเงินเดือน + */ + @Get("{id}") + async listSalaryRankEmployees( + @Path() id: string, + @Query("page") page: number = 1, + @Query("pageSize") pageSize: number = 10, + @Query("keyword") keyword?: string, + ) { + const [salaryRankEmployee, total] = await this.salaryRankEmployeeRepository.findAndCount({ + where: { + salaryEmployeeId: id, + }, + select: ["id", "step", "salaryMounth", "salaryDay"], + order: { + step: "ASC", + }, + ...(keyword ? {} : { skip: (page - 1) * pageSize, take: pageSize }), + }); + if (keyword != undefined && keyword !== "") { + const filteredSalaryRankEmployee = salaryRankEmployee.filter( + (x) => + x.step?.toString().includes(keyword) || + x.salaryMounth?.toString().includes(keyword) || + x.salaryDay?.toString().includes(keyword), + ); + const slicedData = filteredSalaryRankEmployee.slice((page - 1) * pageSize, page * pageSize); + return new HttpSuccess({ data: slicedData, total: filteredSalaryRankEmployee.length }); + } + + return new HttpSuccess({ data: salaryRankEmployee, total }); + } +} diff --git a/src/entities/SalaryEmployees.ts b/src/entities/SalaryEmployees.ts new file mode 100644 index 0000000..1bfa7db --- /dev/null +++ b/src/entities/SalaryEmployees.ts @@ -0,0 +1,112 @@ +import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm"; +import { EntityBase } from "./base/Base"; +import { SalaryRanks } from "./SalaryRanks"; +import { PosType } from "./PosType"; +import { PosLevel } from "./PosLevel"; +import { SalaryRankEmployees } from "./SalaryRankEmployees"; + +@Entity("salaryEmployees") +export class SalaryEmployees extends EntityBase { + @Column({ + comment: "ชื่อผัง", + length: 255, + }) + name: string; + + @Column({ + length: 40, + comment: "กลุ่มบัญชีการจ้าง", + }) + group: string; + + @Column({ + comment: "สถานะการใช้งาน", + }) + isActive: boolean; + + @Column({ + nullable: true, + type: "datetime", + comment: "ให้ไว้ ณ วันที่", + default: null, + }) + date: Date; + + @Column({ + nullable: true, + type: "datetime", + comment: "วันที่มีผลบังคับใช้", + default: null, + }) + startDate: Date; + + @Column({ + nullable: true, + type: "datetime", + comment: "วันที่สิ้นสุดบังคับใช้", + default: null, + }) + endDate: Date; + + @Column({ + nullable: true, + comment: "คำอธิบาย", + length: 255, + default: null, + }) + details: string; + + @OneToMany( + () => SalaryRankEmployees, + (salaryRankEmployees) => salaryRankEmployees.salaryEmployees_, + ) + salaryRankEmployees_: SalaryRankEmployees[]; +} + +export class CreateSalaryEmployee { + @Column() + name: string; + + @Column() + group: string; + + @Column() + isActive: boolean; + + @Column() + date?: Date | null; + + @Column() + startDate?: Date | null; + + @Column() + endDate?: Date | null; + + @Column() + details?: string | null; +} + +export class UpdateSalaryEmployee { + @Column() + name: string; + + @Column() + group: string; + + @Column() + isActive: boolean; + + @Column() + date?: Date | null; + + @Column() + startDate?: Date | null; + + @Column() + endDate?: Date | null; + + @Column() + details?: string | null; +} + +// export type UpdateSalary = Partial ; diff --git a/src/entities/SalaryRankEmployees.ts b/src/entities/SalaryRankEmployees.ts new file mode 100644 index 0000000..d51c68e --- /dev/null +++ b/src/entities/SalaryRankEmployees.ts @@ -0,0 +1,66 @@ +import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm"; +import { EntityBase } from "./base/Base"; +import { Salarys } from "./Salarys"; +import { SalaryEmployees } from "./SalaryEmployees"; + +@Entity("salaryRankEmployees") +export class SalaryRankEmployees extends EntityBase { + @Column({ + length: 40, + comment: "คีย์นอก(FK)ของตาราง salaryEmployee", + }) + salaryEmployeeId: string; + + @Column({ + type: "double", + comment: "ลำดับขั้น", + }) + step: number; + + @Column({ + nullable: true, + type: "double", + comment: "ค่าจ้างรายเดือน", + default: null, + }) + salaryMounth: number | null; + + @Column({ + nullable: true, + type: "double", + comment: "ค่าจ้างรายวัน", + default: null, + }) + salaryDay: number | null; + + @ManyToOne(() => SalaryEmployees, (salaryEmployees) => salaryEmployees.salaryRankEmployees_) + @JoinColumn({ name: "salaryEmployeeId" }) + salaryEmployees_: SalaryEmployees; +} + +export class CreateSalaryRankEmployee { + @Column("uuid") + salaryEmployeeId: string; + + @Column() + step: number; + + @Column() + salaryMounth?: number | null; + + @Column() + salaryDay?: number | null; +} + +export class UpdateSalaryRankEmployee { + @Column() + step: number; + + @Column() + salaryMounth?: number | null; + + @Column() + salaryDay?: number | null; +} + +// export type UpdateSalaryRank = Partial>>; diff --git a/src/migration/1710296971419-add_table_salaryEmployees.ts b/src/migration/1710296971419-add_table_salaryEmployees.ts new file mode 100644 index 0000000..24ecee2 --- /dev/null +++ b/src/migration/1710296971419-add_table_salaryEmployees.ts @@ -0,0 +1,80 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class AddTableSalaryEmployees1710296971419 implements MigrationInterface { + name = 'AddTableSalaryEmployees1710296971419' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`CREATE TABLE \`salaryEmployees\` (\`id\` varchar(36) NOT NULL, \`createdAt\` datetime(6) NOT NULL COMMENT 'สร้างข้อมูลเมื่อ' DEFAULT CURRENT_TIMESTAMP(6), \`createdUserId\` varchar(40) NOT NULL COMMENT 'User Id ที่สร้างข้อมูล' DEFAULT '00000000-0000-0000-0000-000000000000', \`lastUpdatedAt\` datetime(6) NOT NULL COMMENT 'แก้ไขข้อมูลล่าสุดเมื่อ' DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), \`lastUpdateUserId\` varchar(40) NOT NULL COMMENT 'User Id ที่แก้ไขข้อมูล' DEFAULT '00000000-0000-0000-0000-000000000000', \`createdFullName\` varchar(200) NOT NULL COMMENT 'ชื่อ User ที่สร้างข้อมูล' DEFAULT 'string', \`lastUpdateFullName\` varchar(200) NOT NULL COMMENT 'ชื่อ User ที่แก้ไขข้อมูลล่าสุด' DEFAULT 'string', \`name\` varchar(255) NOT NULL COMMENT 'ชื่อผัง', \`group\` varchar(40) NOT NULL COMMENT 'กลุ่มบัญชีการจ้าง', \`isActive\` tinyint NOT NULL COMMENT 'สถานะการใช้งาน', \`date\` datetime NULL COMMENT 'ให้ไว้ ณ วันที่', \`startDate\` datetime NULL COMMENT 'วันที่มีผลบังคับใช้', \`endDate\` datetime NULL COMMENT 'วันที่สิ้นสุดบังคับใช้', \`details\` varchar(255) NULL COMMENT 'คำอธิบาย', PRIMARY KEY (\`id\`)) ENGINE=InnoDB`); + await queryRunner.query(`CREATE TABLE \`salaryRankEmployees\` (\`id\` varchar(36) NOT NULL, \`createdAt\` datetime(6) NOT NULL COMMENT 'สร้างข้อมูลเมื่อ' DEFAULT CURRENT_TIMESTAMP(6), \`createdUserId\` varchar(40) NOT NULL COMMENT 'User Id ที่สร้างข้อมูล' DEFAULT '00000000-0000-0000-0000-000000000000', \`lastUpdatedAt\` datetime(6) NOT NULL COMMENT 'แก้ไขข้อมูลล่าสุดเมื่อ' DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), \`lastUpdateUserId\` varchar(40) NOT NULL COMMENT 'User Id ที่แก้ไขข้อมูล' DEFAULT '00000000-0000-0000-0000-000000000000', \`createdFullName\` varchar(200) NOT NULL COMMENT 'ชื่อ User ที่สร้างข้อมูล' DEFAULT 'string', \`lastUpdateFullName\` varchar(200) NOT NULL COMMENT 'ชื่อ User ที่แก้ไขข้อมูลล่าสุด' DEFAULT 'string', \`salaryEmployeeId\` varchar(40) NOT NULL COMMENT 'คีย์นอก(FK)ของตาราง salaryEmployee', \`step\` double NOT NULL COMMENT 'ลำดับขั้น', \`salaryMounth\` double NULL COMMENT 'ค่าจ้างรายเดือน', \`salaryDay\` double NULL COMMENT 'ค่าจ้างรายวัน', PRIMARY KEY (\`id\`)) ENGINE=InnoDB`); + await queryRunner.query(`ALTER TABLE \`salaryRanks\` DROP FOREIGN KEY \`FK_b6c5dca80c76486ebcadf6a4dd9\``); + await queryRunner.query(`ALTER TABLE \`salaryRanks\` CHANGE \`salaryId\` \`salaryId\` varchar(40) NOT NULL COMMENT 'คีย์นอก(FK)ของตาราง salary'`); + await queryRunner.query(`ALTER TABLE \`posLevel\` DROP FOREIGN KEY \`FK_66caa3d974b67a8a8b343d029b2\``); + await queryRunner.query(`ALTER TABLE \`posLevel\` CHANGE \`posTypeId\` \`posTypeId\` varchar(40) NOT NULL COMMENT 'คีย์นอก(FK)ของตาราง posType'`); + await queryRunner.query(`ALTER TABLE \`salarys\` DROP FOREIGN KEY \`FK_fa211557e2cbee0bb3bbef363f2\``); + await queryRunner.query(`ALTER TABLE \`salarys\` DROP FOREIGN KEY \`FK_683719e5363cc977da591556731\``); + await queryRunner.query(`ALTER TABLE \`salarys\` CHANGE \`posTypeId\` \`posTypeId\` varchar(40) NOT NULL COMMENT 'คีย์นอก(FK)ของตาราง posType'`); + await queryRunner.query(`ALTER TABLE \`salarys\` CHANGE \`posLevelId\` \`posLevelId\` varchar(40) NOT NULL COMMENT 'คีย์นอก(FK)ของตาราง posLevel'`); + await queryRunner.query(`ALTER TABLE \`salaryPeriod\` CHANGE \`revisionId\` \`revisionId\` varchar(40) NULL COMMENT 'คีย์นอก(FK)ของตาราง orgRevision'`); + await queryRunner.query(`ALTER TABLE \`salaryOrg\` DROP FOREIGN KEY \`FK_7fd317035fe8d0e03dc2443cf36\``); + await queryRunner.query(`ALTER TABLE \`salaryOrg\` CHANGE \`salaryPeriodId\` \`salaryPeriodId\` varchar(40) NOT NULL COMMENT 'คีย์นอก(FK)ของตาราง salaryPeriod'`); + await queryRunner.query(`ALTER TABLE \`salaryOrg\` CHANGE \`rootId\` \`rootId\` varchar(40) NOT NULL COMMENT 'คีย์นอก(FK)ของตาราง orgRoot'`); + await queryRunner.query(`ALTER TABLE \`salaryOrg\` CHANGE \`revisionId\` \`revisionId\` varchar(40) NULL COMMENT 'คีย์นอก(FK)ของตาราง orgRevision'`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP FOREIGN KEY \`FK_d925088feca62ab41c131a87914\``); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`salaryOrgId\` \`salaryOrgId\` varchar(40) NOT NULL COMMENT 'คีย์นอก(FK)ของตาราง salaryOrg'`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`rootId\` \`rootId\` varchar(40) NULL COMMENT 'คีย์นอก(FK)ของตาราง orgRoot'`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`root\` \`root\` varchar(255) NULL COMMENT 'ชื่อของหน่วยงาน'`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child1Id\` \`child1Id\` varchar(40) NULL COMMENT 'คีย์นอก(FK)ของตาราง orgChild1'`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child1\` \`child1\` varchar(255) NULL COMMENT 'ชื่อส่วนราชการ'`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child2Id\` \`child2Id\` varchar(40) NULL COMMENT 'คีย์นอก(FK)ของตาราง orgChild2'`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child2\` \`child2\` varchar(255) NULL COMMENT 'ชื่อส่วนราชการ'`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child3Id\` \`child3Id\` varchar(40) NULL COMMENT 'คีย์นอก(FK)ของตาราง orgChild3'`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child3\` \`child3\` varchar(255) NULL COMMENT 'ชื่อส่วนราชการ'`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child4Id\` \`child4Id\` varchar(40) NULL COMMENT 'คีย์นอก(FK)ของตาราง orgChild4'`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child4\` \`child4\` varchar(255) NULL COMMENT 'ชื่อส่วนราชการ'`); + await queryRunner.query(`ALTER TABLE \`salaryRanks\` ADD CONSTRAINT \`FK_b6c5dca80c76486ebcadf6a4dd9\` FOREIGN KEY (\`salaryId\`) REFERENCES \`salarys\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE \`posLevel\` ADD CONSTRAINT \`FK_66caa3d974b67a8a8b343d029b2\` FOREIGN KEY (\`posTypeId\`) REFERENCES \`posType\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE \`salarys\` ADD CONSTRAINT \`FK_fa211557e2cbee0bb3bbef363f2\` FOREIGN KEY (\`posTypeId\`) REFERENCES \`posType\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE \`salarys\` ADD CONSTRAINT \`FK_683719e5363cc977da591556731\` FOREIGN KEY (\`posLevelId\`) REFERENCES \`posLevel\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE \`salaryOrg\` ADD CONSTRAINT \`FK_7fd317035fe8d0e03dc2443cf36\` FOREIGN KEY (\`salaryPeriodId\`) REFERENCES \`salaryPeriod\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` ADD CONSTRAINT \`FK_d925088feca62ab41c131a87914\` FOREIGN KEY (\`salaryOrgId\`) REFERENCES \`salaryOrg\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE \`salaryRankEmployees\` ADD CONSTRAINT \`FK_34faa444506fac48ba76ab1e8b0\` FOREIGN KEY (\`salaryEmployeeId\`) REFERENCES \`salaryEmployees\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`salaryRankEmployees\` DROP FOREIGN KEY \`FK_34faa444506fac48ba76ab1e8b0\``); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP FOREIGN KEY \`FK_d925088feca62ab41c131a87914\``); + await queryRunner.query(`ALTER TABLE \`salaryOrg\` DROP FOREIGN KEY \`FK_7fd317035fe8d0e03dc2443cf36\``); + await queryRunner.query(`ALTER TABLE \`salarys\` DROP FOREIGN KEY \`FK_683719e5363cc977da591556731\``); + await queryRunner.query(`ALTER TABLE \`salarys\` DROP FOREIGN KEY \`FK_fa211557e2cbee0bb3bbef363f2\``); + await queryRunner.query(`ALTER TABLE \`posLevel\` DROP FOREIGN KEY \`FK_66caa3d974b67a8a8b343d029b2\``); + await queryRunner.query(`ALTER TABLE \`salaryRanks\` DROP FOREIGN KEY \`FK_b6c5dca80c76486ebcadf6a4dd9\``); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child4\` \`child4\` varchar(255) NULL`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child4Id\` \`child4Id\` varchar(40) NULL`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child3\` \`child3\` varchar(255) NULL`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child3Id\` \`child3Id\` varchar(40) NULL`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child2\` \`child2\` varchar(255) NULL`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child2Id\` \`child2Id\` varchar(40) NULL`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child1\` \`child1\` varchar(255) NULL`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child1Id\` \`child1Id\` varchar(40) NULL`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`root\` \`root\` varchar(255) NULL`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`rootId\` \`rootId\` varchar(40) NULL`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`salaryOrgId\` \`salaryOrgId\` varchar(40) NOT NULL`); + await queryRunner.query(`ALTER TABLE \`salaryProfile\` ADD CONSTRAINT \`FK_d925088feca62ab41c131a87914\` FOREIGN KEY (\`salaryOrgId\`) REFERENCES \`salaryOrg\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE \`salaryOrg\` CHANGE \`revisionId\` \`revisionId\` varchar(40) NULL COMMENT 'id revision'`); + await queryRunner.query(`ALTER TABLE \`salaryOrg\` CHANGE \`rootId\` \`rootId\` varchar(40) NOT NULL COMMENT 'id หน่วยงาน'`); + await queryRunner.query(`ALTER TABLE \`salaryOrg\` CHANGE \`salaryPeriodId\` \`salaryPeriodId\` varchar(40) NOT NULL`); + await queryRunner.query(`ALTER TABLE \`salaryOrg\` ADD CONSTRAINT \`FK_7fd317035fe8d0e03dc2443cf36\` FOREIGN KEY (\`salaryPeriodId\`) REFERENCES \`salaryPeriod\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE \`salaryPeriod\` CHANGE \`revisionId\` \`revisionId\` varchar(40) NULL COMMENT 'id revision'`); + await queryRunner.query(`ALTER TABLE \`salarys\` CHANGE \`posLevelId\` \`posLevelId\` varchar(40) NOT NULL COMMENT 'Id ระดับของตำแหน่ง'`); + await queryRunner.query(`ALTER TABLE \`salarys\` CHANGE \`posTypeId\` \`posTypeId\` varchar(40) NOT NULL COMMENT 'Id ประเภทของตำแหน่ง'`); + await queryRunner.query(`ALTER TABLE \`salarys\` ADD CONSTRAINT \`FK_683719e5363cc977da591556731\` FOREIGN KEY (\`posLevelId\`) REFERENCES \`posLevel\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE \`salarys\` ADD CONSTRAINT \`FK_fa211557e2cbee0bb3bbef363f2\` FOREIGN KEY (\`posTypeId\`) REFERENCES \`posType\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE \`posLevel\` CHANGE \`posTypeId\` \`posTypeId\` varchar(40) NOT NULL COMMENT 'เป็นระดับของประเภทตำแหน่งใด'`); + await queryRunner.query(`ALTER TABLE \`posLevel\` ADD CONSTRAINT \`FK_66caa3d974b67a8a8b343d029b2\` FOREIGN KEY (\`posTypeId\`) REFERENCES \`posType\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE \`salaryRanks\` CHANGE \`salaryId\` \`salaryId\` varchar(40) NOT NULL COMMENT 'Id ผังเงินเดือน'`); + await queryRunner.query(`ALTER TABLE \`salaryRanks\` ADD CONSTRAINT \`FK_b6c5dca80c76486ebcadf6a4dd9\` FOREIGN KEY (\`salaryId\`) REFERENCES \`salarys\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`); + await queryRunner.query(`DROP TABLE \`salaryRankEmployees\``); + await queryRunner.query(`DROP TABLE \`salaryEmployees\``); + } + +}