From 25a7a8e1a8928899000be6fd6d66c3f0986ac188 Mon Sep 17 00:00:00 2001 From: kittapath Date: Thu, 17 Oct 2024 19:26:33 +0700 Subject: [PATCH 01/10] no message --- src/controllers/CommandController.ts | 19 +++++++++++++++++++ src/controllers/ProfileEditController.ts | 17 ++++++++++++++++- src/entities/ProfileSalary.ts | 14 ++++++++++++++ ...554-update_profilesalary_dateGovernment.ts | 16 ++++++++++++++++ 4 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 src/migration/1729159077554-update_profilesalary_dateGovernment.ts diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index 33ef6533..be46b076 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -2759,6 +2759,25 @@ export class CommandController extends Controller { ) { return new HttpSuccess(); } + @Post("command38/officer/report/delete") + public async command38SalaryOfficerDelete( + @Request() req: RequestWithUser, + @Body() + body: { + refIds: { + refId: string; + commandAffectDate: Date | null; + commandNo: string | null; + commandYear: number; + templateDoc: string | null; + amount: Double | null; + positionSalaryAmount: Double | null; + mouthSalaryAmount: Double | null; + }[]; + }, + ) { + return new HttpSuccess(); + } commandTypePath(commandCode: string) { switch (commandCode) { diff --git a/src/controllers/ProfileEditController.ts b/src/controllers/ProfileEditController.ts index f1b9d7c8..24e74c9f 100644 --- a/src/controllers/ProfileEditController.ts +++ b/src/controllers/ProfileEditController.ts @@ -20,6 +20,7 @@ import { Profile } from "../entities/Profile"; import { CreateProfileEdit, EditProfileEdit, ProfileEdit } from "../entities/ProfileEdit"; import { RequestWithUser } from "../middlewares/user"; import { Brackets } from "typeorm"; +import CallAPI from "../interfaces/call-api"; @Route("api/v1/org/profile/edit") @Tags("ProfileEdit") @@ -184,7 +185,10 @@ export class ProfileEditController extends Controller { @Post() public async newProfileEdit(@Request() req: RequestWithUser, @Body() body: CreateProfileEdit) { - const profile = await this.profileRepo.findOneBy({ keycloak: req.user.sub }); + const profile = await this.profileRepo.findOne({ + where: { keycloak: req.user.sub }, + relations: ["posLevel", "posLevel.posLevelName", "posType", "posType.posTypeName"], + }); if (!profile) { throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); } @@ -203,6 +207,17 @@ export class ProfileEditController extends Controller { data.status = "PENDING"; await this.profileEditRepo.save(data); + await new CallAPI() + .PostData(req, "/org/workflow/add-workflow", { + refId: data.id, + sysName: "REGISTRY_PROFILE", + posLevelName: profile.posLevel.posLevelName, + posTypeName: profile.posType.posTypeName, + }) + .catch((error) => { + console.error("Error calling API:", error); + }); + return new HttpSuccess(data.id); } diff --git a/src/entities/ProfileSalary.ts b/src/entities/ProfileSalary.ts index 91458be0..2103b6cd 100644 --- a/src/entities/ProfileSalary.ts +++ b/src/entities/ProfileSalary.ts @@ -141,6 +141,20 @@ export class ProfileSalary extends EntityBase { }) order: number; + @Column({ + comment: "วันที่", + type: "datetime", + nullable: true, + }) + dateGovernment: Date; + + @Column({ + nullable: true, + comment: "เข้ารับราชการ", + default: null, + }) + isGovernment: boolean; + @OneToMany(() => ProfileSalaryHistory, (profileSalaryHistory) => profileSalaryHistory.histories) profileSalaryHistories: ProfileSalaryHistory[]; diff --git a/src/migration/1729159077554-update_profilesalary_dateGovernment.ts b/src/migration/1729159077554-update_profilesalary_dateGovernment.ts new file mode 100644 index 00000000..0daecd55 --- /dev/null +++ b/src/migration/1729159077554-update_profilesalary_dateGovernment.ts @@ -0,0 +1,16 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class UpdateProfilesalaryDateGovernment1729159077554 implements MigrationInterface { + name = 'UpdateProfilesalaryDateGovernment1729159077554' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`profileSalary\` ADD \`dateGovernment\` datetime NULL COMMENT 'วันที่'`); + await queryRunner.query(`ALTER TABLE \`profileSalary\` ADD \`isGovernment\` tinyint NULL COMMENT 'เข้ารับราชการ'`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`profileSalary\` DROP COLUMN \`isGovernment\``); + await queryRunner.query(`ALTER TABLE \`profileSalary\` DROP COLUMN \`dateGovernment\``); + } + +} From 289b447b331d389d207a472685789736873c5a23 Mon Sep 17 00:00:00 2001 From: kittapath Date: Thu, 17 Oct 2024 22:11:54 +0700 Subject: [PATCH 02/10] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=8A?= =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=95=E0=B8=B2=E0=B8=A1=E0=B8=81?= =?UTF-8?q?=E0=B8=A5=E0=B8=B8=E0=B9=88=E0=B8=A1=E0=B9=83=E0=B8=99=E0=B9=82?= =?UTF-8?q?=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2?= =?UTF-8?q?=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/CommandController.ts | 68 ++++++++++ src/controllers/OrganizationController.ts | 66 +++++----- src/controllers/PositionController.ts | 123 ++++++++++++++++-- src/entities/Command.ts | 4 + src/entities/PosMaster.ts | 7 + src/entities/ProfileSalary.ts | 13 ++ ...69375946-update_profilesalary_commandId.ts | 16 +++ ...2500950-update_profilesalary_commandId1.ts | 14 ++ 8 files changed, 269 insertions(+), 42 deletions(-) create mode 100644 src/migration/1729169375946-update_profilesalary_commandId.ts create mode 100644 src/migration/1729172500950-update_profilesalary_commandId1.ts diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index be46b076..357afdef 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -2747,6 +2747,62 @@ export class CommandController extends Controller { }[]; }, ) { + await Promise.all( + body.refIds.map(async (item) => { + const profile = await this.profileEmployeeRepository.findOne({ + where: { id: item.refId }, + relations: ["posType", "posLevel"], + }); + if (!profile) { + throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว"); + } + + const dest_item = await this.salaryRepo.findOne({ + where: { profileEmployeeId: item.refId }, + order: { order: "DESC" }, + }); + const before = null; + const data = new ProfileSalary(); + + const meta = { + profileId: profile.id, + date: new Date(), + amount: item.amount, + positionSalaryAmount: item.positionSalaryAmount, + mouthSalaryAmount: item.mouthSalaryAmount, + posNo: "", + position: profile.position, + positionType: profile.posType?.posTypeName || null, + positionLevel: profile.posLevel?.posLevelName || null, + refCommandNo: `${item.commandNo}/${Extension.ToThaiYear(item.commandYear)}`, + templateDoc: item.templateDoc, + order: dest_item == null ? 1 : dest_item.order + 1, + createdUserId: req.user.sub, + createdFullName: req.user.name, + lastUpdateUserId: req.user.sub, + lastUpdateFullName: req.user.name, + createdAt: new Date(), + lastUpdatedAt: new Date(), + }; + + Object.assign(data, meta); + const history = new ProfileSalaryHistory(); + Object.assign(history, { ...data, id: undefined }); + + await this.salaryRepo.save(data, { data: req }); + setLogDataDiff(req, { before, after: data }); + history.profileSalaryId = data.id; + await this.salaryHistoryRepo.save(history, { data: req }); + }), + ); + const posMasters = await this.posMasterRepository.find({ + where: { id: In(body.refIds.map((x) => x.refId)) }, + }); + const data = posMasters.map((_data) => ({ + ..._data, + statusReport: "PENDING", + })); + await this.posMasterRepository.save(data); return new HttpSuccess(); } @Post("command38/officer/report") @@ -2757,6 +2813,12 @@ export class CommandController extends Controller { refIds: string[]; }, ) { + const posMasters = await this.posMasterRepository.find({ where: { id: In(body.refIds) } }); + const data = posMasters.map((_data) => ({ + ..._data, + statusReport: "REPORT", + })); + await this.posMasterRepository.save(data); return new HttpSuccess(); } @Post("command38/officer/report/delete") @@ -2776,6 +2838,12 @@ export class CommandController extends Controller { }[]; }, ) { + const posMasters = await this.posMasterRepository.find({ where: { id: In(body.refIds) } }); + const data = posMasters.map((_data) => ({ + ..._data, + statusReport: "PENDING", + })); + await this.posMasterRepository.save(data); return new HttpSuccess(); } diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts index 37339837..22ac4164 100644 --- a/src/controllers/OrganizationController.ts +++ b/src/controllers/OrganizationController.ts @@ -655,7 +655,7 @@ export class OrganizationController extends Controller { }); }); } - + const _orgRevisions = await this.orgRevisionRepository.find({ where: [{ orgRevisionIsDraft: true, id: Not(revision.id) }], }); @@ -3444,39 +3444,39 @@ export class OrganizationController extends Controller { profile.position = position?.positionName ?? _null; await this.profileRepo.save(profile); } - const profileSalary = await this.salaryRepository.findOne({ - where: { profileId: item.next_holderId }, - order: { createdAt: "DESC" }, - }); + // const profileSalary = await this.salaryRepository.findOne({ + // where: { profileId: item.next_holderId }, + // order: { createdAt: "DESC" }, + // }); - const shortName = - item != null && item.orgChild4 != null - ? `${item.orgChild4.orgChild4ShortName}${item.posMasterNo}` - : item != null && item?.orgChild3 != null - ? `${item.orgChild3.orgChild3ShortName}${item.posMasterNo}` - : item != null && item?.orgChild2 != null - ? `${item.orgChild2.orgChild2ShortName}${item.posMasterNo}` - : item != null && item?.orgChild1 != null - ? `${item.orgChild1.orgChild1ShortName}${item.posMasterNo}` - : item != null && item?.orgRoot != null - ? `${item.orgRoot.orgRootShortName}${item.posMasterNo}` - : null; - await new FunctionMain().newSalaryFunction(request, { - profileId: item.next_holderId, - date: new Date(), - amount: profileSalary?.amount ?? null, - positionSalaryAmount: profileSalary?.positionSalaryAmount ?? null, - mouthSalaryAmount: profileSalary?.mouthSalaryAmount ?? null, - posNo: shortName, - position: position?.positionName ?? _null, - positionLine: position?.positionField ?? _null, - positionPathSide: position?.positionArea ?? _null, - positionExecutive: position?.posExecutive?.posExecutiveName ?? _null, - positionType: position?.posType?.posTypeName ?? _null, - positionLevel: position?.posLevel?.posLevelName ?? _null, - refCommandNo: null, - templateDoc: "ปรับโครงสร้าง", - }); + // const shortName = + // item != null && item.orgChild4 != null + // ? `${item.orgChild4.orgChild4ShortName}${item.posMasterNo}` + // : item != null && item?.orgChild3 != null + // ? `${item.orgChild3.orgChild3ShortName}${item.posMasterNo}` + // : item != null && item?.orgChild2 != null + // ? `${item.orgChild2.orgChild2ShortName}${item.posMasterNo}` + // : item != null && item?.orgChild1 != null + // ? `${item.orgChild1.orgChild1ShortName}${item.posMasterNo}` + // : item != null && item?.orgRoot != null + // ? `${item.orgRoot.orgRootShortName}${item.posMasterNo}` + // : null; + // await new FunctionMain().newSalaryFunction(request, { + // profileId: item.next_holderId, + // date: new Date(), + // amount: profileSalary?.amount ?? null, + // positionSalaryAmount: profileSalary?.positionSalaryAmount ?? null, + // mouthSalaryAmount: profileSalary?.mouthSalaryAmount ?? null, + // posNo: shortName, + // position: position?.positionName ?? _null, + // positionLine: position?.positionField ?? _null, + // positionPathSide: position?.positionArea ?? _null, + // positionExecutive: position?.posExecutive?.posExecutiveName ?? _null, + // positionType: position?.posType?.posTypeName ?? _null, + // positionLevel: position?.posLevel?.posLevelName ?? _null, + // refCommandNo: null, + // templateDoc: "ปรับโครงสร้าง", + // }); } item.current_holderId = item.next_holderId; item.next_holderId = null; diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts index 74cfbc9f..ea22ef05 100644 --- a/src/controllers/PositionController.ts +++ b/src/controllers/PositionController.ts @@ -151,7 +151,7 @@ export class PositionController extends Controller { posDict.lastUpdateFullName = request.user.name; posDict.createdAt = new Date(); posDict.lastUpdatedAt = new Date(); - await this.posDictRepository.save(posDict, {data: request}); + await this.posDictRepository.save(posDict, { data: request }); setLogDataDiff(request, { before, after: posDict }); return new HttpSuccess(posDict.id); } @@ -223,7 +223,7 @@ export class PositionController extends Controller { where: { posMasterId: posMaster.id }, }); if (posMasterAssigns.length > 0) { - await this.posMasterAssignRepo.remove(posMasterAssigns, {data:request}); + await this.posMasterAssignRepo.remove(posMasterAssigns, { data: request }); } // await this.posMasterAssignRepo.delete({ posMasterId: posMaster.id }); return new HttpSuccess(); @@ -307,8 +307,8 @@ export class PositionController extends Controller { posExecutive.lastUpdateFullName = request.user.name; posExecutive.createdAt = new Date(); posExecutive.lastUpdatedAt = new Date(); - await this.posExecutiveRepository.save(posExecutive, {data:request}); - setLogDataDiff(request, {before, after: posExecutive}); + await this.posExecutiveRepository.save(posExecutive, { data: request }); + setLogDataDiff(request, { before, after: posExecutive }); } const rowRepeated = await this.posDictRepository.findOne({ @@ -334,8 +334,8 @@ export class PositionController extends Controller { posDict.lastUpdateFullName = request.user.name; posDict.createdAt = new Date(); posDict.lastUpdatedAt = new Date(); - await this.posDictRepository.save(posDict, {data:request}); - setLogDataDiff(request, {before, after: posDict}); + await this.posDictRepository.save(posDict, { data: request }); + setLogDataDiff(request, { before, after: posDict }); return new HttpSuccess(posDict.id); } @@ -433,8 +433,8 @@ export class PositionController extends Controller { posDict.posDictArea = requestBody.posDictArea ? requestBody.posDictArea : ""; posDict.isSpecial = requestBody.isSpecial; // this.posDictRepository.merge(posDict, requestBody); - await this.posDictRepository.save(posDict, {data:request}); - setLogDataDiff(request, {before, after: posDict}); + await this.posDictRepository.save(posDict, { data: request }); + setLogDataDiff(request, { before, after: posDict }); return new HttpSuccess(); } @@ -452,7 +452,7 @@ export class PositionController extends Controller { if (!delPosDict) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลตำแหน่งในสายงานนี้"); } - await this.posDictRepository.remove(delPosDict, {data: request}); + await this.posDictRepository.remove(delPosDict, { data: request }); return new HttpSuccess(); } @@ -4053,4 +4053,109 @@ export class PositionController extends Controller { } return new HttpSuccess(); } + + /** + * API รายชื่อตามกลุ่มในโครงสร้าง + * + * @summary รายชื่อตามกลุ่มในโครงสร้าง + * + */ + @Post("report/draft") + async reportDraft( + @Body() + body: { + type: string; + rootId: string; + }, + ) { + let conditionGroup = ""; + if (body.type.trim().toUpperCase() == "GROUP1") { + conditionGroup = + "(posType.posTypeName = 'ทั่วไป' AND posLevel.posLevelName = 'ชำนาญงาน') OR (posType.posTypeName = 'ทั่วไป' AND posLevel.posLevelName = 'ปฏิบัติงาน') OR (posType.posTypeName = 'วิชาการ' AND posLevel.posLevelName = 'ปฏิบัติการ') OR (posType.posTypeName = 'วิชาการ' AND posLevel.posLevelName = 'ชำนาญการ')"; + } else if (body.type.trim().toUpperCase() == "GROUP2") { + conditionGroup = + "(posType.posTypeName = 'ทั่วไป' AND posLevel.posLevelName = 'อาวุโส') OR (posType.posTypeName = 'วิชาการ' AND posLevel.posLevelName = 'ชำนาญการพิเศษ') OR (posType.posTypeName = 'อำนวยการ' AND posLevel.posLevelName = 'ต้น')"; + } else if (body.type.trim().toUpperCase() == "GROUP3") { + conditionGroup = + "(posType.posTypeName = 'ทั่วไป' AND posLevel.posLevelName = 'ทักษะพิเศษ') OR (posType.posTypeName = 'วิชาการ' AND posLevel.posLevelName = 'เชี่ยวชาญ') OR (posType.posTypeName = 'วิชาการ' AND posLevel.posLevelName = 'ทรงคุณวุฒิ') OR (posType.posTypeName = 'อำนวยการ' AND posLevel.posLevelName = 'สูง') OR (posType.posTypeName = 'บริหาร' AND posLevel.posLevelName = 'ต้น') OR (posType.posTypeName = 'บริหาร' AND posLevel.posLevelName = 'สูง')"; + } else { + throw new HttpError(HttpStatusCode.NOT_FOUND, "กลุ่มเป้าหมายไม่ถูกต้อง"); + } + + let posMaster = await AppDataSource.getRepository(PosMaster) + .createQueryBuilder("posMaster") + .leftJoinAndSelect("posMaster.orgRoot", "orgRoot") + .leftJoinAndSelect("posMaster.orgChild1", "orgChild1") + .leftJoinAndSelect("posMaster.orgChild2", "orgChild2") + .leftJoinAndSelect("posMaster.orgChild3", "orgChild3") + .leftJoinAndSelect("posMaster.orgChild4", "orgChild4") + .leftJoinAndSelect("posMaster.next_holder", "next_holder") + .leftJoinAndSelect("posMaster.positions", "positions") + .leftJoinAndSelect("positions.posType", "posType") + .leftJoinAndSelect("positions.posLevel", "posLevel") + .leftJoinAndSelect("posMaster.orgRevision", "orgRevision") + .andWhere("posMaster.orgRootId = :orgRootId", { orgRootId: body.rootId }) + .andWhere("posMaster.statusReport = :statusReport", { statusReport: "PENDING" }) + .andWhere("posMaster.next_holderId IS NOT NULL") + .andWhere("orgRevision.orgRevisionIsCurrent = :orgRevisionIsCurrent", { + orgRevisionIsCurrent: false, + }) + .andWhere("orgRevision.orgRevisionIsDraft = :orgRevisionIsDraft", { + orgRevisionIsDraft: true, + }) + .andWhere("positions.positionIsSelected = :isSelected", { isSelected: true }) + .andWhere( + new Brackets((qb) => { + qb.andWhere(conditionGroup); + }), + ) + .orderBy("posMaster.posMasterOrder", "ASC") + .select([ + "posMaster.id", + "posMaster.posMasterNo", + "positions.positionName", + "positions.positionIsSelected", + "posType.posTypeName", + "posLevel.posLevelName", + "orgRoot.orgRootShortName", + "orgChild1.orgChild1ShortName", + "orgChild2.orgChild2ShortName", + "orgChild3.orgChild3ShortName", + "orgChild4.orgChild4ShortName", + "next_holder.prefix", + "next_holder.firstName", + "next_holder.lastName", + ]) + .getMany(); + const _posMaster = posMaster.map((x) => { + const posMasterNo = + x.orgChild4 != null + ? `${x.orgChild4.orgChild4ShortName}${x.posMasterNo}` + : x != null && x?.orgChild3 != null + ? `${x.orgChild3.orgChild3ShortName}${x.posMasterNo}` + : x != null && x?.orgChild2 != null + ? `${x.orgChild2.orgChild2ShortName}${x.posMasterNo}` + : x != null && x?.orgChild1 != null + ? `${x.orgChild1.orgChild1ShortName}${x.posMasterNo}` + : x != null && x?.orgRoot != null + ? `${x.orgRoot.orgRootShortName}${x.posMasterNo}` + : null; + const position = + x.positions.filter((x) => x.positionIsSelected == true).length > 0 + ? x.positions.filter((x) => x.positionIsSelected == true)[0] + : null; + return { + id: x.id, + posMasterNo: posMasterNo, + positionName: position?.positionName || null, + posType: position?.posType?.posTypeName || null, + posLevel: position?.posLevel?.posLevelName || null, + prefix: x.next_holder?.prefix || null, + firstName: x.next_holder?.firstName || null, + lastName: x.next_holder?.lastName || null, + }; + }); + + return new HttpSuccess(_posMaster); + } } diff --git a/src/entities/Command.ts b/src/entities/Command.ts index 3254aac7..c33cce38 100644 --- a/src/entities/Command.ts +++ b/src/entities/Command.ts @@ -4,6 +4,7 @@ import { CommandType } from "./CommandType"; import { CommandSend } from "./CommandSend"; import { CommandSalary } from "./CommandSalary"; import { CommandRecive } from "./CommandRecive"; +import { ProfileSalary } from "./ProfileSalary"; @Entity("command") export class Command extends EntityBase { @@ -151,6 +152,9 @@ export class Command extends EntityBase { @OneToMany(() => CommandRecive, (commandRecive) => commandRecive.command) commandRecives: CommandRecive[]; + + @OneToMany(() => ProfileSalary, (profileSalary) => profileSalary.command) + profileSalarys: ProfileSalary[]; } export class CreateCommand { diff --git a/src/entities/PosMaster.ts b/src/entities/PosMaster.ts index 8aea9570..d32fc598 100644 --- a/src/entities/PosMaster.ts +++ b/src/entities/PosMaster.ts @@ -195,6 +195,13 @@ export class PosMaster extends EntityBase { }) authRoleId: string; + @Column({ + comment: "สถานะออกคำสั่ง", + default: "PENDING", + length: 20, + }) + statusReport: string; + @ManyToOne(() => AuthRole, (authRole) => authRole.posMasters) @JoinColumn({ name: "authRoleId" }) authRole: AuthRole; diff --git a/src/entities/ProfileSalary.ts b/src/entities/ProfileSalary.ts index 2103b6cd..f2a56217 100644 --- a/src/entities/ProfileSalary.ts +++ b/src/entities/ProfileSalary.ts @@ -3,6 +3,7 @@ import { EntityBase } from "./base/Base"; import { Profile } from "./Profile"; import { ProfileEmployee } from "./ProfileEmployee"; import { ProfileSalaryHistory } from "./ProfileSalaryHistory"; +import { Command } from "./Command"; @Entity("profileSalary") export class ProfileSalary extends EntityBase { @@ -155,6 +156,18 @@ export class ProfileSalary extends EntityBase { }) isGovernment: boolean; + @Column({ + nullable: true, + length: 40, + comment: "คีย์นอก(FK)ของตาราง command", + default: null, + }) + commandId: string; + + @ManyToOne(() => Command, (command) => command.profileSalarys) + @JoinColumn({ name: "commandId" }) + command: Command; + @OneToMany(() => ProfileSalaryHistory, (profileSalaryHistory) => profileSalaryHistory.histories) profileSalaryHistories: ProfileSalaryHistory[]; diff --git a/src/migration/1729169375946-update_profilesalary_commandId.ts b/src/migration/1729169375946-update_profilesalary_commandId.ts new file mode 100644 index 00000000..e76240d2 --- /dev/null +++ b/src/migration/1729169375946-update_profilesalary_commandId.ts @@ -0,0 +1,16 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class UpdateProfilesalaryCommandId1729169375946 implements MigrationInterface { + name = 'UpdateProfilesalaryCommandId1729169375946' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`profileSalary\` ADD \`commandId\` varchar(40) NULL COMMENT 'คีย์นอก(FK)ของตาราง command'`); + await queryRunner.query(`ALTER TABLE \`profileSalary\` ADD CONSTRAINT \`FK_5aa33e13619d0c878032e2dc1bd\` FOREIGN KEY (\`commandId\`) REFERENCES \`command\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`profileSalary\` DROP FOREIGN KEY \`FK_5aa33e13619d0c878032e2dc1bd\``); + await queryRunner.query(`ALTER TABLE \`profileSalary\` DROP COLUMN \`commandId\``); + } + +} diff --git a/src/migration/1729172500950-update_profilesalary_commandId1.ts b/src/migration/1729172500950-update_profilesalary_commandId1.ts new file mode 100644 index 00000000..5187c1d6 --- /dev/null +++ b/src/migration/1729172500950-update_profilesalary_commandId1.ts @@ -0,0 +1,14 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class UpdateProfilesalaryCommandId11729172500950 implements MigrationInterface { + name = 'UpdateProfilesalaryCommandId11729172500950' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`posMaster\` ADD \`statusReport\` varchar(20) NOT NULL COMMENT 'สถานะออกคำสั่ง' DEFAULT 'PENDING'`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`posMaster\` DROP COLUMN \`statusReport\``); + } + +} From b2e1a5be3d6e804cf6b3c5f2c6294a0ce695d8ea Mon Sep 17 00:00:00 2001 From: kittapath Date: Thu, 17 Oct 2024 22:13:44 +0700 Subject: [PATCH 03/10] no message --- src/controllers/PositionController.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts index ea22ef05..d9339494 100644 --- a/src/controllers/PositionController.ts +++ b/src/controllers/PositionController.ts @@ -4072,10 +4072,10 @@ export class PositionController extends Controller { if (body.type.trim().toUpperCase() == "GROUP1") { conditionGroup = "(posType.posTypeName = 'ทั่วไป' AND posLevel.posLevelName = 'ชำนาญงาน') OR (posType.posTypeName = 'ทั่วไป' AND posLevel.posLevelName = 'ปฏิบัติงาน') OR (posType.posTypeName = 'วิชาการ' AND posLevel.posLevelName = 'ปฏิบัติการ') OR (posType.posTypeName = 'วิชาการ' AND posLevel.posLevelName = 'ชำนาญการ')"; - } else if (body.type.trim().toUpperCase() == "GROUP2") { + } else if (body.type.trim().toUpperCase() == "GROUP1.2") { conditionGroup = "(posType.posTypeName = 'ทั่วไป' AND posLevel.posLevelName = 'อาวุโส') OR (posType.posTypeName = 'วิชาการ' AND posLevel.posLevelName = 'ชำนาญการพิเศษ') OR (posType.posTypeName = 'อำนวยการ' AND posLevel.posLevelName = 'ต้น')"; - } else if (body.type.trim().toUpperCase() == "GROUP3") { + } else if (body.type.trim().toUpperCase() == "GROUP2") { conditionGroup = "(posType.posTypeName = 'ทั่วไป' AND posLevel.posLevelName = 'ทักษะพิเศษ') OR (posType.posTypeName = 'วิชาการ' AND posLevel.posLevelName = 'เชี่ยวชาญ') OR (posType.posTypeName = 'วิชาการ' AND posLevel.posLevelName = 'ทรงคุณวุฒิ') OR (posType.posTypeName = 'อำนวยการ' AND posLevel.posLevelName = 'สูง') OR (posType.posTypeName = 'บริหาร' AND posLevel.posLevelName = 'ต้น') OR (posType.posTypeName = 'บริหาร' AND posLevel.posLevelName = 'สูง')"; } else { From f51adcc8cbbf202faefc1fa1bce5efa4097b6166 Mon Sep 17 00:00:00 2001 From: kittapath Date: Thu, 17 Oct 2024 22:24:25 +0700 Subject: [PATCH 04/10] no message --- src/controllers/PositionController.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts index d9339494..9608bca7 100644 --- a/src/controllers/PositionController.ts +++ b/src/controllers/PositionController.ts @@ -4069,7 +4069,7 @@ export class PositionController extends Controller { }, ) { let conditionGroup = ""; - if (body.type.trim().toUpperCase() == "GROUP1") { + if (body.type.trim().toUpperCase() == "GROUP1.1") { conditionGroup = "(posType.posTypeName = 'ทั่วไป' AND posLevel.posLevelName = 'ชำนาญงาน') OR (posType.posTypeName = 'ทั่วไป' AND posLevel.posLevelName = 'ปฏิบัติงาน') OR (posType.posTypeName = 'วิชาการ' AND posLevel.posLevelName = 'ปฏิบัติการ') OR (posType.posTypeName = 'วิชาการ' AND posLevel.posLevelName = 'ชำนาญการ')"; } else if (body.type.trim().toUpperCase() == "GROUP1.2") { @@ -4094,7 +4094,9 @@ export class PositionController extends Controller { .leftJoinAndSelect("positions.posType", "posType") .leftJoinAndSelect("positions.posLevel", "posLevel") .leftJoinAndSelect("posMaster.orgRevision", "orgRevision") - .andWhere("posMaster.orgRootId = :orgRootId", { orgRootId: body.rootId }) + .andWhere("posMaster.orgRootId LIKE :orgRootId", { + orgRootId: body.type.trim().toUpperCase() == "GROUP1" ? body.rootId : `%%`, + }) .andWhere("posMaster.statusReport = :statusReport", { statusReport: "PENDING" }) .andWhere("posMaster.next_holderId IS NOT NULL") .andWhere("orgRevision.orgRevisionIsCurrent = :orgRevisionIsCurrent", { From ce5c56bfca08a2fbd51670cf8444e98b158fe771 Mon Sep 17 00:00:00 2001 From: kittapath Date: Fri, 18 Oct 2024 10:00:53 +0700 Subject: [PATCH 05/10] =?UTF-8?q?delete=20@SuccessResponse(HttpStatusCode.?= =?UTF-8?q?OK,=20"=E0=B8=AA=E0=B8=B3=E0=B9=80=E0=B8=A3=E0=B9=87=E0=B8=88")?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/BloodGroupController.ts | 1 - src/controllers/ChangePositionController.ts | 1 - src/controllers/CommandController.ts | 1 - src/controllers/CommandSalaryController.ts | 1 - src/controllers/CommandSysController.ts | 1 - src/controllers/CommandTypeController.ts | 1 - src/controllers/DistrictController.ts | 1 - src/controllers/EducationLevelController.ts | 1 - src/controllers/EmployeePosLevelController.ts | 1 - src/controllers/EmployeePosTypeController.ts | 13 ++++++------- src/controllers/EmployeePositionController.ts | 5 ++--- src/controllers/GenderController.ts | 1 - src/controllers/InsigniaController.ts | 1 - src/controllers/InsigniaTypeController.ts | 5 ++--- src/controllers/OrgChild1Controller.ts | 1 - src/controllers/OrgChild2Controller.ts | 1 - src/controllers/OrgChild3Controller.ts | 1 - src/controllers/OrgChild4Controller.ts | 1 - src/controllers/OrganizationController.ts | 1 - .../OrganizationUnauthorizeController.ts | 1 - src/controllers/PermissionOrgController.ts | 5 ++--- src/controllers/PosExecutiveController.ts | 9 ++++----- src/controllers/PosLevelController.ts | 1 - src/controllers/PosMasterActController.ts | 1 - src/controllers/PosTypeController.ts | 13 ++++++------- src/controllers/PositionController.ts | 1 - src/controllers/PrefixController.ts | 1 - src/controllers/ProvinceController.ts | 1 - src/controllers/RankController.ts | 1 - src/controllers/RelationshipController.ts | 1 - src/controllers/ReligionController.ts | 1 - src/controllers/ReportController.ts | 1 - src/controllers/SubDistrictController.ts | 1 - 33 files changed, 22 insertions(+), 55 deletions(-) diff --git a/src/controllers/BloodGroupController.ts b/src/controllers/BloodGroupController.ts index d407bdb3..5192ac58 100644 --- a/src/controllers/BloodGroupController.ts +++ b/src/controllers/BloodGroupController.ts @@ -28,7 +28,6 @@ import { RequestWithUser } from "../middlewares/user"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class BloodGroupController extends Controller { private bloodGroupRepository = AppDataSource.getRepository(BloodGroup); diff --git a/src/controllers/ChangePositionController.ts b/src/controllers/ChangePositionController.ts index 300d0b69..07d931dd 100644 --- a/src/controllers/ChangePositionController.ts +++ b/src/controllers/ChangePositionController.ts @@ -44,7 +44,6 @@ import CallAPI from "../interfaces/call-api"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class ChangePositionController extends Controller { private changePositionRepository = AppDataSource.getRepository(ChangePosition); private profileChangePositionRepository = AppDataSource.getRepository(ProfileChangePosition); diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index 357afdef..ec8ee51e 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -64,7 +64,6 @@ import permission from "../interfaces/permission"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class CommandController extends Controller { private commandRepository = AppDataSource.getRepository(Command); private commandTypeRepository = AppDataSource.getRepository(CommandType); diff --git a/src/controllers/CommandSalaryController.ts b/src/controllers/CommandSalaryController.ts index d2873153..d12e9e29 100644 --- a/src/controllers/CommandSalaryController.ts +++ b/src/controllers/CommandSalaryController.ts @@ -29,7 +29,6 @@ import { CommandSys } from "../entities/CommandSys"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class CommandSalaryController extends Controller { private commandSalaryRepository = AppDataSource.getRepository(CommandSalary); private commandSysRepository = AppDataSource.getRepository(CommandSys); diff --git a/src/controllers/CommandSysController.ts b/src/controllers/CommandSysController.ts index 7c6a8aa1..6bd8e93a 100644 --- a/src/controllers/CommandSysController.ts +++ b/src/controllers/CommandSysController.ts @@ -26,7 +26,6 @@ import { CommandSys, CreateCommandSys, UpdateCommandSys } from "../entities/Comm HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class CommandSysController extends Controller { private commandSysRepository = AppDataSource.getRepository(CommandSys); diff --git a/src/controllers/CommandTypeController.ts b/src/controllers/CommandTypeController.ts index 5884e9eb..839f4766 100644 --- a/src/controllers/CommandTypeController.ts +++ b/src/controllers/CommandTypeController.ts @@ -29,7 +29,6 @@ import { CommandSys } from "../entities/CommandSys"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class CommandTypeController extends Controller { private commandTypeRepository = AppDataSource.getRepository(CommandType); private commandSysRepository = AppDataSource.getRepository(CommandSys); diff --git a/src/controllers/DistrictController.ts b/src/controllers/DistrictController.ts index dc67548c..7fa09dda 100644 --- a/src/controllers/DistrictController.ts +++ b/src/controllers/DistrictController.ts @@ -30,7 +30,6 @@ import { RequestWithUser } from "../middlewares/user"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class DistrictController extends Controller { private districtRepository = AppDataSource.getRepository(District); private provinceRepository = AppDataSource.getRepository(Province); diff --git a/src/controllers/EducationLevelController.ts b/src/controllers/EducationLevelController.ts index bda53464..f9d24458 100644 --- a/src/controllers/EducationLevelController.ts +++ b/src/controllers/EducationLevelController.ts @@ -28,7 +28,6 @@ import { setLogDataDiff } from "../interfaces/utils"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class EducationLevelController extends Controller { private educationLevelRepository = AppDataSource.getRepository(EducationLevel); diff --git a/src/controllers/EmployeePosLevelController.ts b/src/controllers/EmployeePosLevelController.ts index 79d50615..3c8c30b3 100644 --- a/src/controllers/EmployeePosLevelController.ts +++ b/src/controllers/EmployeePosLevelController.ts @@ -33,7 +33,6 @@ import { EmployeePosDict } from "../entities/EmployeePosDict"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class EmployeePosLevelController extends Controller { private employeePosDictRepository = AppDataSource.getRepository(EmployeePosDict); private employeePosTypeRepository = AppDataSource.getRepository(EmployeePosType); diff --git a/src/controllers/EmployeePosTypeController.ts b/src/controllers/EmployeePosTypeController.ts index 7fd73ae1..1fc2d25c 100644 --- a/src/controllers/EmployeePosTypeController.ts +++ b/src/controllers/EmployeePosTypeController.ts @@ -35,7 +35,6 @@ import { setLogDataDiff } from "../interfaces/utils"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class EmployeePosTypeController extends Controller { private employeePosDictRepository = AppDataSource.getRepository(EmployeePosDict); private employeePosTypeRepository = AppDataSource.getRepository(EmployeePosType); @@ -81,8 +80,8 @@ export class EmployeePosTypeController extends Controller { EmpPosType.lastUpdateFullName = request.user.name; EmpPosType.createdAt = new Date(); EmpPosType.lastUpdatedAt = new Date(); - await this.employeePosTypeRepository.save(EmpPosType, {data: request}); - setLogDataDiff(request, {before, after: EmpPosType}); + await this.employeePosTypeRepository.save(EmpPosType, { data: request }); + setLogDataDiff(request, { before, after: EmpPosType }); return new HttpSuccess(EmpPosType.id); } @@ -129,8 +128,8 @@ export class EmployeePosTypeController extends Controller { EmpPosType.lastUpdateFullName = request.user.name; EmpPosType.lastUpdatedAt = new Date(); this.employeePosTypeRepository.merge(EmpPosType, requestBody); - await this.employeePosTypeRepository.save(EmpPosType, {data: request}); - setLogDataDiff(request, {before, after: EmpPosType}); + await this.employeePosTypeRepository.save(EmpPosType, { data: request }); + setLogDataDiff(request, { before, after: EmpPosType }); return new HttpSuccess(EmpPosType.id); } @@ -147,8 +146,8 @@ export class EmployeePosTypeController extends Controller { try { result = await this.employeePosTypeRepository.findOne({ where: { id: id }, - }) - await this.employeePosTypeRepository.remove(result, {data: request}); + }); + await this.employeePosTypeRepository.remove(result, { data: request }); } catch { throw new HttpError( HttpStatusCode.NOT_FOUND, diff --git a/src/controllers/EmployeePositionController.ts b/src/controllers/EmployeePositionController.ts index 3f601929..9a006c2a 100644 --- a/src/controllers/EmployeePositionController.ts +++ b/src/controllers/EmployeePositionController.ts @@ -48,7 +48,6 @@ import { after } from "node:test"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class EmployeePositionController extends Controller { private employeePosDictRepository = AppDataSource.getRepository(EmployeePosDict); private employeePosTypeRepository = AppDataSource.getRepository(EmployeePosType); @@ -169,8 +168,8 @@ export class EmployeePositionController extends Controller { empPosDict.lastUpdateFullName = request.user.name; empPosDict.lastUpdatedAt = new Date(); this.employeePosDictRepository.merge(empPosDict, requestBody); - await this.employeePosDictRepository.save(empPosDict,{data: request}); - setLogDataDiff( request, { before, after: empPosDict }); + await this.employeePosDictRepository.save(empPosDict, { data: request }); + setLogDataDiff(request, { before, after: empPosDict }); return new HttpSuccess(empPosDict.id); } diff --git a/src/controllers/GenderController.ts b/src/controllers/GenderController.ts index 06cc820e..7033aac8 100644 --- a/src/controllers/GenderController.ts +++ b/src/controllers/GenderController.ts @@ -29,7 +29,6 @@ import { RequestWithUser } from "../middlewares/user"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class GenderController extends Controller { private genderRepository = AppDataSource.getRepository(Gender); diff --git a/src/controllers/InsigniaController.ts b/src/controllers/InsigniaController.ts index b85f9d3b..8fce1440 100644 --- a/src/controllers/InsigniaController.ts +++ b/src/controllers/InsigniaController.ts @@ -32,7 +32,6 @@ import { RequestWithUser } from "../middlewares/user"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class InsigniaController extends Controller { private insigniaTypeRepository = AppDataSource.getRepository(InsigniaType); private insigniaRepository = AppDataSource.getRepository(Insignia); diff --git a/src/controllers/InsigniaTypeController.ts b/src/controllers/InsigniaTypeController.ts index 074e0b80..3435bf38 100644 --- a/src/controllers/InsigniaTypeController.ts +++ b/src/controllers/InsigniaTypeController.ts @@ -33,7 +33,6 @@ import { setLogDataDiff } from "../interfaces/utils"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class InsigniaTypeController extends Controller { private insigniaTypeRepository = AppDataSource.getRepository(InsigniaType); private insigniaRepository = AppDataSource.getRepository(Insignia); @@ -110,7 +109,7 @@ export class InsigniaTypeController extends Controller { insigniaType.lastUpdatedAt = new Date(); this.insigniaTypeRepository.merge(insigniaType, requestBody); await this.insigniaTypeRepository.save(insigniaType, { data: request }); - setLogDataDiff( request, { before, after: insigniaType }); + setLogDataDiff(request, { before, after: insigniaType }); return new HttpSuccess(insigniaType.id); } @@ -136,7 +135,7 @@ export class InsigniaTypeController extends Controller { "ไม่สามารถลบได้ เนื่องจากพบข้อมูลที่ตารางเครื่องราชอิสริยาภรณ์", ); } - await this.insigniaTypeRepository.remove(delInsigniaType, {data: request}); + await this.insigniaTypeRepository.remove(delInsigniaType, { data: request }); return new HttpSuccess(); } diff --git a/src/controllers/OrgChild1Controller.ts b/src/controllers/OrgChild1Controller.ts index 8d7399d9..fe6afde7 100644 --- a/src/controllers/OrgChild1Controller.ts +++ b/src/controllers/OrgChild1Controller.ts @@ -39,7 +39,6 @@ import { setLogDataDiff } from "../interfaces/utils"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class OrgChild1Controller { private orgRootRepository = AppDataSource.getRepository(OrgRoot); private child1Repository = AppDataSource.getRepository(OrgChild1); diff --git a/src/controllers/OrgChild2Controller.ts b/src/controllers/OrgChild2Controller.ts index eb71d2df..5f1c450e 100644 --- a/src/controllers/OrgChild2Controller.ts +++ b/src/controllers/OrgChild2Controller.ts @@ -40,7 +40,6 @@ import { setLogDataDiff } from "../interfaces/utils"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class OrgChild2Controller extends Controller { private orgRootRepository = AppDataSource.getRepository(OrgRoot); private child1Repository = AppDataSource.getRepository(OrgChild1); diff --git a/src/controllers/OrgChild3Controller.ts b/src/controllers/OrgChild3Controller.ts index ab7df30b..cc7e505d 100644 --- a/src/controllers/OrgChild3Controller.ts +++ b/src/controllers/OrgChild3Controller.ts @@ -37,7 +37,6 @@ import { setLogDataDiff } from "../interfaces/utils"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class OrgChild3Controller { private orgRootRepository = AppDataSource.getRepository(OrgRoot); private child2Repository = AppDataSource.getRepository(OrgChild2); diff --git a/src/controllers/OrgChild4Controller.ts b/src/controllers/OrgChild4Controller.ts index 1b81b2ae..f6f8b594 100644 --- a/src/controllers/OrgChild4Controller.ts +++ b/src/controllers/OrgChild4Controller.ts @@ -40,7 +40,6 @@ import { setLogDataDiff } from "../interfaces/utils"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class OrgChild4Controller extends Controller { private orgRootRepository = AppDataSource.getRepository(OrgRoot); private child3Repository = AppDataSource.getRepository(OrgChild3); diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts index 22ac4164..763a1d3e 100644 --- a/src/controllers/OrganizationController.ts +++ b/src/controllers/OrganizationController.ts @@ -42,7 +42,6 @@ import { AuthRole } from "../entities/AuthRole"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class OrganizationController extends Controller { private orgRevisionRepository = AppDataSource.getRepository(OrgRevision); private permissionOrgRepository = AppDataSource.getRepository(PermissionOrg); diff --git a/src/controllers/OrganizationUnauthorizeController.ts b/src/controllers/OrganizationUnauthorizeController.ts index 319404d3..0a40e41e 100644 --- a/src/controllers/OrganizationUnauthorizeController.ts +++ b/src/controllers/OrganizationUnauthorizeController.ts @@ -18,7 +18,6 @@ import { ProfileEmployee } from "../entities/ProfileEmployee"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class OrganizationUnauthorizeController extends Controller { private orgRevisionRepository = AppDataSource.getRepository(OrgRevision); private orgRootRepository = AppDataSource.getRepository(OrgRoot); diff --git a/src/controllers/PermissionOrgController.ts b/src/controllers/PermissionOrgController.ts index 4481a8ee..ade79359 100644 --- a/src/controllers/PermissionOrgController.ts +++ b/src/controllers/PermissionOrgController.ts @@ -38,7 +38,6 @@ import { setLogDataDiff } from "../interfaces/utils"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class PermissionOrgController extends Controller { private orgRootRepository = AppDataSource.getRepository(OrgRoot); private profileRepository = AppDataSource.getRepository(Profile); @@ -481,7 +480,7 @@ export class PermissionOrgController extends Controller { _permissionOrg.lastUpdateFullName = request.user.name; _permissionOrg.createdAt = new Date(); _permissionOrg.lastUpdatedAt = new Date(); - await this.permissionOrgRepository.save(_permissionOrg, {data:request}); + await this.permissionOrgRepository.save(_permissionOrg, { data: request }); setLogDataDiff(request, { before, after: _permissionOrg }); return new HttpSuccess(); } @@ -521,7 +520,7 @@ export class PermissionOrgController extends Controller { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบสิทธิ์นี้อยู่ในระบบแล้ว"); } - await this.permissionOrgRepository.remove(_delPermissionOrg, {data:req}); + await this.permissionOrgRepository.remove(_delPermissionOrg, { data: req }); return new HttpSuccess(); } diff --git a/src/controllers/PosExecutiveController.ts b/src/controllers/PosExecutiveController.ts index c7636b62..9a81e3db 100644 --- a/src/controllers/PosExecutiveController.ts +++ b/src/controllers/PosExecutiveController.ts @@ -31,7 +31,6 @@ import { setLogDataDiff } from "../interfaces/utils"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class PosExecutiveController extends Controller { private posExecutiveRepository = AppDataSource.getRepository(PosExecutive); private positionRepository = AppDataSource.getRepository(Position); @@ -85,8 +84,8 @@ export class PosExecutiveController extends Controller { posExecutive.lastUpdateFullName = request.user.name; posExecutive.createdAt = new Date(); posExecutive.lastUpdatedAt = new Date(); - await this.posExecutiveRepository.save(posExecutive, {data: request}); - setLogDataDiff(request, {before, after: posExecutive}); + await this.posExecutiveRepository.save(posExecutive, { data: request }); + setLogDataDiff(request, { before, after: posExecutive }); return new HttpSuccess(posExecutive.id); } @@ -147,8 +146,8 @@ export class PosExecutiveController extends Controller { posExecutive.lastUpdateFullName = request.user.name; posExecutive.lastUpdatedAt = new Date(); // this.posExecutiveRepository.merge(posExecutive, requestBody); - await this.posExecutiveRepository.save(posExecutive, {data: request}); - setLogDataDiff(request, {before, after: posExecutive}); + await this.posExecutiveRepository.save(posExecutive, { data: request }); + setLogDataDiff(request, { before, after: posExecutive }); return new HttpSuccess(); } diff --git a/src/controllers/PosLevelController.ts b/src/controllers/PosLevelController.ts index 8563bc46..df6845ae 100644 --- a/src/controllers/PosLevelController.ts +++ b/src/controllers/PosLevelController.ts @@ -31,7 +31,6 @@ import { Not } from "typeorm"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class PosLevelController extends Controller { private posTypeRepository = AppDataSource.getRepository(PosType); private posLevelRepository = AppDataSource.getRepository(PosLevel); diff --git a/src/controllers/PosMasterActController.ts b/src/controllers/PosMasterActController.ts index ff2d96a6..64ae1c03 100644 --- a/src/controllers/PosMasterActController.ts +++ b/src/controllers/PosMasterActController.ts @@ -30,7 +30,6 @@ import Extension from "../interfaces/extension"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class PosMasterActController extends Controller { private orgRevisionRepository = AppDataSource.getRepository(OrgRevision); private posMasterActRepository = AppDataSource.getRepository(PosMasterAct); diff --git a/src/controllers/PosTypeController.ts b/src/controllers/PosTypeController.ts index bd762af6..62e0d73b 100644 --- a/src/controllers/PosTypeController.ts +++ b/src/controllers/PosTypeController.ts @@ -33,7 +33,6 @@ import { RequestWithUser } from "../middlewares/user"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class PosTypeController extends Controller { private posTypeRepository = AppDataSource.getRepository(PosType); private posLevelRepository = AppDataSource.getRepository(PosLevel); @@ -73,8 +72,8 @@ export class PosTypeController extends Controller { posType.lastUpdateFullName = request.user.name; posType.createdAt = new Date(); posType.lastUpdatedAt = new Date(); - await this.posTypeRepository.save(posType, {data: request}); - setLogDataDiff(request, {before , after: posType}); + await this.posTypeRepository.save(posType, { data: request }); + setLogDataDiff(request, { before, after: posType }); return new HttpSuccess(posType); } @@ -113,8 +112,8 @@ export class PosTypeController extends Controller { posType.lastUpdateFullName = request.user.name; posType.lastUpdatedAt = new Date(); this.posTypeRepository.merge(posType, requestBody); - await this.posTypeRepository.save(posType, {data: request}); - setLogDataDiff(request,{ before, after:posType }); + await this.posTypeRepository.save(posType, { data: request }); + setLogDataDiff(request, { before, after: posType }); return new HttpSuccess(posType.id); } @@ -130,10 +129,10 @@ export class PosTypeController extends Controller { let result: any; try { result = await this.posTypeRepository.findOne({ where: { id } }); - if(!result){ + if (!result) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลประเภทตำแหน่งนี้"); } - await this.posTypeRepository.remove(result, {data: result}); + await this.posTypeRepository.remove(result, { data: result }); } catch { throw new HttpError( HttpStatusCode.NOT_FOUND, diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts index 9608bca7..833da9f6 100644 --- a/src/controllers/PositionController.ts +++ b/src/controllers/PositionController.ts @@ -52,7 +52,6 @@ import { Assign } from "../entities/Assign"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class PositionController extends Controller { private posExecutiveRepository = AppDataSource.getRepository(PosExecutive); private posTypeRepository = AppDataSource.getRepository(PosType); diff --git a/src/controllers/PrefixController.ts b/src/controllers/PrefixController.ts index 92f6f96a..5d3d5fa6 100644 --- a/src/controllers/PrefixController.ts +++ b/src/controllers/PrefixController.ts @@ -30,7 +30,6 @@ import { request } from "axios"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class PrefixController extends Controller { private prefixRepository = AppDataSource.getRepository(Prefixe); diff --git a/src/controllers/ProvinceController.ts b/src/controllers/ProvinceController.ts index 92169272..24142a45 100644 --- a/src/controllers/ProvinceController.ts +++ b/src/controllers/ProvinceController.ts @@ -29,7 +29,6 @@ import { RequestWithUser } from "../middlewares/user"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class ProvinceController extends Controller { private provinceRepository = AppDataSource.getRepository(Province); diff --git a/src/controllers/RankController.ts b/src/controllers/RankController.ts index c5b0e6cb..adc8fe6f 100644 --- a/src/controllers/RankController.ts +++ b/src/controllers/RankController.ts @@ -28,7 +28,6 @@ import { RequestWithUser } from "../middlewares/user"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class RankController extends Controller { private rankRepository = AppDataSource.getRepository(Rank); diff --git a/src/controllers/RelationshipController.ts b/src/controllers/RelationshipController.ts index 1dd9ff5c..2c3da7d8 100644 --- a/src/controllers/RelationshipController.ts +++ b/src/controllers/RelationshipController.ts @@ -29,7 +29,6 @@ import { request } from "axios"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class RelationshipController extends Controller { private relationshipRepository = AppDataSource.getRepository(Relationship); diff --git a/src/controllers/ReligionController.ts b/src/controllers/ReligionController.ts index dfd3b98d..624ed6f5 100644 --- a/src/controllers/ReligionController.ts +++ b/src/controllers/ReligionController.ts @@ -28,7 +28,6 @@ import { RequestWithUser } from "../middlewares/user"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class ReligionController extends Controller { private religionRepository = AppDataSource.getRepository(Religion); diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 92e3a778..65cdc21d 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -18,7 +18,6 @@ import Extension from "../interfaces/extension"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class ReportController extends Controller { private orgRevisionRepository = AppDataSource.getRepository(OrgRevision); private orgRootRepository = AppDataSource.getRepository(OrgRoot); diff --git a/src/controllers/SubDistrictController.ts b/src/controllers/SubDistrictController.ts index d503a695..2e212fc9 100644 --- a/src/controllers/SubDistrictController.ts +++ b/src/controllers/SubDistrictController.ts @@ -30,7 +30,6 @@ import { setLogDataDiff } from "../interfaces/utils"; HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) -@SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class SubDistrictController extends Controller { private subDistrictRepository = AppDataSource.getRepository(SubDistrict); private districtRepository = AppDataSource.getRepository(District); From 6b5a47213cf37166c380fed63dc5bcf66d5fb1b1 Mon Sep 17 00:00:00 2001 From: kittapath Date: Fri, 18 Oct 2024 11:04:46 +0700 Subject: [PATCH 06/10] no message --- src/controllers/WorkflowController.ts | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/controllers/WorkflowController.ts b/src/controllers/WorkflowController.ts index e92d8327..c25b2446 100644 --- a/src/controllers/WorkflowController.ts +++ b/src/controllers/WorkflowController.ts @@ -263,26 +263,31 @@ export class WorkflowController extends Controller { }, relations: ["workflow"], }); - if (!stateOperatorUser) - throw new HttpError(HttpStatus.NOT_FOUND, "ผู้ใช้งานนี้ไม่มีหน้าที่ในกระบวนการนี้"); + const workflow = await this.workflowRepo.findOne({ + where: { + refId: body.refId, + sysName: body.system, + }, + }); + if (!workflow) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่สามารถดำเนินการกระบวนการนี้ได้"); const operator = await this.stateOperatorRepo.findOne({ where: { - operator: stateOperatorUser.operator, - stateId: stateOperatorUser.workflow.stateId, + operator: stateOperatorUser?.operator || "", + stateId: workflow.stateId, }, relations: ["state"], }); if (!operator) { const state = await this.stateRepo.findOne({ where: { - id: stateOperatorUser.workflow.stateId, + id: workflow.stateId, }, }); return new HttpSuccess({ stateId: state?.id || null, stateNo: state?.order || null, stateName: state?.name || null, - operator: stateOperatorUser.operator, + operator: stateOperatorUser?.operator || null, can_view: false, can_update: false, can_operate: false, @@ -333,6 +338,7 @@ export class WorkflowController extends Controller { prefix: x.profile.prefix, firstName: x.profile.firstName, lastName: x.profile.lastName, + isComment: x.profile.keycloak == req.user.sub ? true : false, profileId: x.profileId, isAcceptSetting: x.isAcceptSetting, isApproveSetting: x.isApproveSetting, From 3fc5a73947fb88aa35d9215dadc02162dc63c596 Mon Sep 17 00:00:00 2001 From: kittapath Date: Fri, 18 Oct 2024 11:06:26 +0700 Subject: [PATCH 07/10] =?UTF-8?q?report/draft=20=E0=B9=80=E0=B8=9E?= =?UTF-8?q?=E0=B8=B4=E0=B9=88=E0=B8=A1=20citizenId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/PositionController.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts index 833da9f6..1d4cb0bb 100644 --- a/src/controllers/PositionController.ts +++ b/src/controllers/PositionController.ts @@ -4154,6 +4154,7 @@ export class PositionController extends Controller { prefix: x.next_holder?.prefix || null, firstName: x.next_holder?.firstName || null, lastName: x.next_holder?.lastName || null, + citizenId: x.next_holder?.citizenId || null, }; }); From 6a23f310468391077fe9778cb73c0593fff01aaf Mon Sep 17 00:00:00 2001 From: kittapath Date: Fri, 18 Oct 2024 11:33:04 +0700 Subject: [PATCH 08/10] comment workflow --- src/controllers/AuthRoleController.ts | 13 ++++---- src/controllers/BloodGroupController.ts | 1 - src/controllers/ChangePositionController.ts | 1 - src/controllers/CommandController.ts | 3 +- src/controllers/CommandSalaryController.ts | 2 -- src/controllers/CommandSysController.ts | 1 - src/controllers/CommandTypeController.ts | 2 -- src/controllers/DistrictController.ts | 1 - src/controllers/EducationLevelController.ts | 1 - src/controllers/EmployeePosLevelController.ts | 2 -- src/controllers/EmployeePosTypeController.ts | 3 -- src/controllers/EmployeePositionController.ts | 3 -- src/controllers/GenderController.ts | 1 - src/controllers/ImportDataController.ts | 30 ++----------------- src/controllers/InsigniaController.ts | 8 ++--- src/controllers/InsigniaTypeController.ts | 6 +--- src/controllers/MyController.ts | 2 +- src/controllers/OrgChild1Controller.ts | 17 +---------- src/controllers/OrgChild2Controller.ts | 3 -- src/controllers/OrgChild3Controller.ts | 17 +---------- src/controllers/OrgChild4Controller.ts | 4 --- src/controllers/OrgRootController.ts | 5 ++-- src/controllers/OrganizationController.ts | 5 ---- .../OrganizationDotnetController.ts | 9 ++---- .../OrganizationUnauthorizeController.ts | 4 +-- src/controllers/PermissionController.ts | 2 +- src/controllers/PermissionOrgController.ts | 8 ----- src/controllers/PosExecutiveController.ts | 2 -- src/controllers/PosLevelController.ts | 3 -- src/controllers/PosMasterActController.ts | 2 -- src/controllers/PosTypeController.ts | 4 --- src/controllers/PositionController.ts | 7 ++--- src/controllers/PrefixController.ts | 2 -- src/controllers/WorkflowController.ts | 22 ++++---------- src/entities/PosLevel.ts | 7 +---- src/entities/PosType.ts | 6 +--- 36 files changed, 32 insertions(+), 177 deletions(-) diff --git a/src/controllers/AuthRoleController.ts b/src/controllers/AuthRoleController.ts index 75e23541..1a090366 100644 --- a/src/controllers/AuthRoleController.ts +++ b/src/controllers/AuthRoleController.ts @@ -17,11 +17,10 @@ import HttpError from "../interfaces/http-error"; import HttpStatus from "../interfaces/http-status"; import HttpSuccess from "../interfaces/http-success"; import HttpStatusCode from "../interfaces/http-status"; -import { AuthRole, CreateAuthRole, UpdateAuthRole, CreateAddAuthRole } from "../entities/AuthRole"; +import { AuthRole, CreateAuthRole, CreateAddAuthRole } from "../entities/AuthRole"; import { AuthRoleAttr } from "../entities/AuthRoleAttr"; import { PosMaster } from "../entities/PosMaster"; import { EmployeePosMaster } from "../entities/EmployeePosMaster"; -import { promisify } from "util"; import { setLogDataDiff } from "../interfaces/utils"; const REDIS_HOST = process.env.REDIS_HOST; @@ -105,7 +104,7 @@ export class AuthRoleController extends Controller { posMaster.lastUpdateFullName = req.user.name; posMaster.lastUpdatedAt = new Date(); posMaster.authRoleId = body.authRoleId; - await this.posMasterRepository.save(posMaster, {data: req}); + await this.posMasterRepository.save(posMaster, { data: req }); setLogDataDiff(req, { before, after: posMaster }); // เช็คว่าถ้ามีค่า current_holderId ให้ลบ key สิทธิ์ใน redis @@ -149,7 +148,7 @@ export class AuthRoleController extends Controller { posMaster.lastUpdateFullName = req.user.name; posMaster.lastUpdatedAt = new Date(); posMaster.authRoleId = body.authRoleId; - await this.employeePosMasterRepository.save(posMaster, {data: req}); + await this.employeePosMasterRepository.save(posMaster, { data: req }); setLogDataDiff(req, { before, after: posMaster }); return new HttpSuccess(); } @@ -229,7 +228,7 @@ export class AuthRoleController extends Controller { // ...newAttrs.map((attr) => this.authRoleAttrRepo.save(attr)), // ]); - await this.authRoleAttrRepo.remove(roleAttrData, {data: req}); + await this.authRoleAttrRepo.remove(roleAttrData, { data: req }); const newAttrs = body.authRoleAttrs.map((attr) => { const newAttr = new AuthRoleAttr(); @@ -246,7 +245,7 @@ export class AuthRoleController extends Controller { }); const before = structuredClone(record); await Promise.all([ - this.authRoleRepo.save(record, {data: req}), + this.authRoleRepo.save(record, { data: req }), setLogDataDiff(req, { before, after: record }), ...newAttrs.map((attr) => this.authRoleAttrRepo.save(attr)), ]); @@ -271,7 +270,7 @@ export class AuthRoleController extends Controller { if (!result) { throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล"); } - await this.authRoleRepo.remove(result, {data: req}); + await this.authRoleRepo.remove(result, { data: req }); } catch { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่สามารถลบข้อมูลได้"); } diff --git a/src/controllers/BloodGroupController.ts b/src/controllers/BloodGroupController.ts index 5192ac58..4d0d57c7 100644 --- a/src/controllers/BloodGroupController.ts +++ b/src/controllers/BloodGroupController.ts @@ -9,7 +9,6 @@ import { Body, Path, Request, - SuccessResponse, Response, Get, } from "tsoa"; diff --git a/src/controllers/ChangePositionController.ts b/src/controllers/ChangePositionController.ts index 07d931dd..55e9c96a 100644 --- a/src/controllers/ChangePositionController.ts +++ b/src/controllers/ChangePositionController.ts @@ -10,7 +10,6 @@ import { Body, Path, Request, - SuccessResponse, Response, Query, } from "tsoa"; diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index ec8ee51e..79a8d2fe 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -9,7 +9,6 @@ import { Body, Path, Request, - SuccessResponse, Response, Get, Query, @@ -19,7 +18,7 @@ import HttpSuccess from "../interfaces/http-success"; import HttpStatusCode from "../interfaces/http-status"; import HttpError from "../interfaces/http-error"; import { Command } from "../entities/Command"; -import { Brackets, LessThan, MoreThan, Double, In, Not, Between } from "typeorm"; +import { Brackets, LessThan, MoreThan, Double, In, Between } from "typeorm"; import { CommandType } from "../entities/CommandType"; import { CommandSend } from "../entities/CommandSend"; import { Profile, CreateProfileAllFields } from "../entities/Profile"; diff --git a/src/controllers/CommandSalaryController.ts b/src/controllers/CommandSalaryController.ts index d12e9e29..bf426436 100644 --- a/src/controllers/CommandSalaryController.ts +++ b/src/controllers/CommandSalaryController.ts @@ -9,7 +9,6 @@ import { Body, Path, Request, - SuccessResponse, Response, Get, Query, @@ -19,7 +18,6 @@ import HttpSuccess from "../interfaces/http-success"; import HttpStatusCode from "../interfaces/http-status"; import HttpError from "../interfaces/http-error"; import { CommandSalary, CreateCommandSalary, UpdateCommandSalary } from "../entities/CommandSalary"; -import { Not } from "typeorm"; import { CommandSys } from "../entities/CommandSys"; @Route("api/v1/org/commandSalary") diff --git a/src/controllers/CommandSysController.ts b/src/controllers/CommandSysController.ts index 6bd8e93a..459f7464 100644 --- a/src/controllers/CommandSysController.ts +++ b/src/controllers/CommandSysController.ts @@ -9,7 +9,6 @@ import { Body, Path, Request, - SuccessResponse, Response, Get, } from "tsoa"; diff --git a/src/controllers/CommandTypeController.ts b/src/controllers/CommandTypeController.ts index 839f4766..22df0e3b 100644 --- a/src/controllers/CommandTypeController.ts +++ b/src/controllers/CommandTypeController.ts @@ -9,7 +9,6 @@ import { Body, Path, Request, - SuccessResponse, Response, Get, Query, @@ -19,7 +18,6 @@ import HttpSuccess from "../interfaces/http-success"; import HttpStatusCode from "../interfaces/http-status"; import HttpError from "../interfaces/http-error"; import { CommandType, CreateCommandType, UpdateCommandType } from "../entities/CommandType"; -import { Not } from "typeorm"; import { CommandSys } from "../entities/CommandSys"; @Route("api/v1/org/commandType") diff --git a/src/controllers/DistrictController.ts b/src/controllers/DistrictController.ts index 7fa09dda..6817aa5a 100644 --- a/src/controllers/DistrictController.ts +++ b/src/controllers/DistrictController.ts @@ -9,7 +9,6 @@ import { Body, Path, Request, - SuccessResponse, Response, Get, } from "tsoa"; diff --git a/src/controllers/EducationLevelController.ts b/src/controllers/EducationLevelController.ts index f9d24458..0e669a90 100644 --- a/src/controllers/EducationLevelController.ts +++ b/src/controllers/EducationLevelController.ts @@ -9,7 +9,6 @@ import { Body, Path, Request, - SuccessResponse, Response, Get, } from "tsoa"; diff --git a/src/controllers/EmployeePosLevelController.ts b/src/controllers/EmployeePosLevelController.ts index 3c8c30b3..7d9de453 100644 --- a/src/controllers/EmployeePosLevelController.ts +++ b/src/controllers/EmployeePosLevelController.ts @@ -10,7 +10,6 @@ import { Body, Path, Request, - SuccessResponse, Response, } from "tsoa"; import { AppDataSource } from "../database/data-source"; @@ -34,7 +33,6 @@ import { EmployeePosDict } from "../entities/EmployeePosDict"; "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) export class EmployeePosLevelController extends Controller { - private employeePosDictRepository = AppDataSource.getRepository(EmployeePosDict); private employeePosTypeRepository = AppDataSource.getRepository(EmployeePosType); private employeePosLevelRepository = AppDataSource.getRepository(EmployeePosLevel); diff --git a/src/controllers/EmployeePosTypeController.ts b/src/controllers/EmployeePosTypeController.ts index 1fc2d25c..1526ac0b 100644 --- a/src/controllers/EmployeePosTypeController.ts +++ b/src/controllers/EmployeePosTypeController.ts @@ -10,7 +10,6 @@ import { Body, Path, Request, - SuccessResponse, Response, } from "tsoa"; import { AppDataSource } from "../database/data-source"; @@ -36,9 +35,7 @@ import { setLogDataDiff } from "../interfaces/utils"; "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) export class EmployeePosTypeController extends Controller { - private employeePosDictRepository = AppDataSource.getRepository(EmployeePosDict); private employeePosTypeRepository = AppDataSource.getRepository(EmployeePosType); - private employeePosLevelRepository = AppDataSource.getRepository(EmployeePosLevel); /** * API เพิ่มกลุ่มงานลูกจ้างประจำ * diff --git a/src/controllers/EmployeePositionController.ts b/src/controllers/EmployeePositionController.ts index 9a006c2a..8c9c5d5e 100644 --- a/src/controllers/EmployeePositionController.ts +++ b/src/controllers/EmployeePositionController.ts @@ -10,7 +10,6 @@ import { Body, Path, Request, - SuccessResponse, Response, Query, } from "tsoa"; @@ -38,9 +37,7 @@ import { ProfileEmployee } from "../entities/ProfileEmployee"; import { AuthRole } from "../entities/AuthRole"; import { RequestWithUser } from "../middlewares/user"; import permission from "../interfaces/permission"; -import { request } from "axios"; import { setLogDataDiff } from "../interfaces/utils"; -import { after } from "node:test"; @Route("api/v1/org/employee/pos") @Tags("Employee") @Security("bearerAuth") diff --git a/src/controllers/GenderController.ts b/src/controllers/GenderController.ts index 7033aac8..499baff8 100644 --- a/src/controllers/GenderController.ts +++ b/src/controllers/GenderController.ts @@ -9,7 +9,6 @@ import { Body, Path, Request, - SuccessResponse, Response, Get, } from "tsoa"; diff --git a/src/controllers/ImportDataController.ts b/src/controllers/ImportDataController.ts index 6ff986f7..5ca8c05a 100644 --- a/src/controllers/ImportDataController.ts +++ b/src/controllers/ImportDataController.ts @@ -1,23 +1,7 @@ -import { - Controller, - Get, - Post, - Put, - Delete, - Route, - Security, - Tags, - Body, - Path, - Request, - Query, - UploadedFile, -} from "tsoa"; +import { Controller, Post, Route, Security, Tags, Request, UploadedFile } from "tsoa"; import { AppDataSource } from "../database/data-source"; -import { Brackets, Double, In, Not } from "typeorm"; +import { In, Not } from "typeorm"; import HttpSuccess from "../interfaces/http-success"; -import HttpError from "../interfaces/http-error"; -import HttpStatusCode from "../interfaces/http-status"; import { UseInterceptors } from "@nestjs/common"; import { Profile } from "../entities/Profile"; import { ProfileEmployee } from "../entities/ProfileEmployee"; @@ -31,16 +15,9 @@ import { PosType } from "../entities/PosType"; import { FileInterceptor } from "@nestjs/platform-express"; import * as xlsx from "xlsx"; import Extension from "../interfaces/extension"; -import { - calculateAge, - calculateRetireDate, - calculateRetireLaw, - calculateRetireYear, - removeProfileInOrganize, -} from "../interfaces/utils"; +import { calculateRetireDate, calculateRetireLaw } from "../interfaces/utils"; import * as fs from "fs"; import * as path from "path"; -import csv from "csv-parser"; // src/importCsv.ts const { createConnection } = require("typeorm"); import csvParser from "csv-parser"; import { HR_POSITION_OFFICER } from "../entities/HR_POSITION_OFFICER"; @@ -48,7 +25,6 @@ import { HR_PERSONAL_OFFICER_FAMILY } from "../entities/HR_PERSONAL_OFFICER_FAMI const BATCH_SIZE = 1000; // import { EducationMis } from "../entities/EducationMis"; -import moment from "moment"; import { EducationMis } from "../entities/EducationMis"; import { ProvinceImport } from "../entities/ProvinceImport"; import { AmphurImport } from "../entities/AmphurImport"; diff --git a/src/controllers/InsigniaController.ts b/src/controllers/InsigniaController.ts index 8fce1440..aaa0c88d 100644 --- a/src/controllers/InsigniaController.ts +++ b/src/controllers/InsigniaController.ts @@ -4,24 +4,20 @@ import { Post, Put, Delete, - Patch, Route, Security, Tags, Body, Path, Request, - Example, - SuccessResponse, Response, - 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 { Equal, ILike, In, IsNull, Like, Not, Brackets, Between } from "typeorm"; -import { InsigniaType, CreateInsigniaType, UpdateInsigniaType } from "../entities/InsigniaType"; +import { Not } from "typeorm"; +import { InsigniaType } from "../entities/InsigniaType"; import { Insignia, CreateInsignias, UpdateInsignias } from "../entities/Insignia"; import permission from "../interfaces/permission"; import { RequestWithUser } from "../middlewares/user"; diff --git a/src/controllers/InsigniaTypeController.ts b/src/controllers/InsigniaTypeController.ts index 3435bf38..f3c6d076 100644 --- a/src/controllers/InsigniaTypeController.ts +++ b/src/controllers/InsigniaTypeController.ts @@ -4,23 +4,19 @@ import { Post, Put, Delete, - Patch, Route, Security, Tags, Body, Path, Request, - Example, - SuccessResponse, Response, - 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 { Equal, ILike, In, IsNull, Like, Not, Brackets, Between } from "typeorm"; +import { Not } from "typeorm"; import { InsigniaType, CreateInsigniaType, UpdateInsigniaType } from "../entities/InsigniaType"; import { Insignia } from "../entities/Insignia"; import permission from "../interfaces/permission"; diff --git a/src/controllers/MyController.ts b/src/controllers/MyController.ts index cb30c0cc..4dde32ca 100644 --- a/src/controllers/MyController.ts +++ b/src/controllers/MyController.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Post, Put, Delete, Patch, Route, Security, Tags } from "tsoa"; +import { Controller, Get, Route, Security, Tags } from "tsoa"; @Route("/hello") @Tags("Test") diff --git a/src/controllers/OrgChild1Controller.ts b/src/controllers/OrgChild1Controller.ts index fe6afde7..142470bd 100644 --- a/src/controllers/OrgChild1Controller.ts +++ b/src/controllers/OrgChild1Controller.ts @@ -4,21 +4,7 @@ import { OrgRoot } from "../entities/OrgRoot"; import { OrgChild1, CreateOrgChild1, UpdateOrgChild1 } from "../entities/OrgChild1"; import { OrgChild2 } from "../entities/OrgChild2"; import { OrgChild3 } from "../entities/OrgChild3"; -import { - Body, - Delete, - Get, - Path, - Post, - Put, - Response, - Route, - SuccessResponse, - Tags, - Query, - Request, - Security, -} from "tsoa"; +import { Body, Delete, Get, Path, Post, Put, Response, Route, Tags, Request, Security } from "tsoa"; import HttpStatusCode from "../interfaces/http-status"; import HttpSuccess from "../interfaces/http-success"; import HttpError from "../interfaces/http-error"; @@ -28,7 +14,6 @@ import { PosMaster } from "../entities/PosMaster"; import { Position } from "../entities/Position"; import { EmployeePosMaster } from "../entities/EmployeePosMaster"; import { EmployeePosition } from "../entities/EmployeePosition"; -import { Like } from "typeorm/browser"; import { RequestWithUser } from "../middlewares/user"; import permission from "../interfaces/permission"; import { setLogDataDiff } from "../interfaces/utils"; diff --git a/src/controllers/OrgChild2Controller.ts b/src/controllers/OrgChild2Controller.ts index 5f1c450e..a4aba5d6 100644 --- a/src/controllers/OrgChild2Controller.ts +++ b/src/controllers/OrgChild2Controller.ts @@ -5,7 +5,6 @@ import { Post, Put, Delete, - Patch, Route, Security, Tags, @@ -13,7 +12,6 @@ import { Body, Request, Example, - SuccessResponse, Response, } from "tsoa"; import HttpStatusCode from "../interfaces/http-status"; @@ -41,7 +39,6 @@ import { setLogDataDiff } from "../interfaces/utils"; "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) export class OrgChild2Controller extends Controller { - private orgRootRepository = AppDataSource.getRepository(OrgRoot); private child1Repository = AppDataSource.getRepository(OrgChild1); private child2Repository = AppDataSource.getRepository(OrgChild2); private child3Repository = AppDataSource.getRepository(OrgChild3); diff --git a/src/controllers/OrgChild3Controller.ts b/src/controllers/OrgChild3Controller.ts index cc7e505d..6e58e40c 100644 --- a/src/controllers/OrgChild3Controller.ts +++ b/src/controllers/OrgChild3Controller.ts @@ -4,21 +4,7 @@ import { OrgRoot } from "../entities/OrgRoot"; import { OrgChild2 } from "../entities/OrgChild2"; import { OrgChild3, CreateOrgChild3, UpdateOrgChild3 } from "../entities/OrgChild3"; import { OrgChild4 } from "../entities/OrgChild4"; -import { - Body, - Delete, - Get, - Path, - Post, - Put, - Response, - Route, - SuccessResponse, - Tags, - Query, - Request, - Security, -} from "tsoa"; +import { Body, Delete, Get, Path, Post, Put, Response, Route, Tags, Request, Security } from "tsoa"; import HttpStatusCode from "../interfaces/http-status"; import HttpSuccess from "../interfaces/http-success"; import HttpError from "../interfaces/http-error"; @@ -38,7 +24,6 @@ import { setLogDataDiff } from "../interfaces/utils"; "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) export class OrgChild3Controller { - private orgRootRepository = AppDataSource.getRepository(OrgRoot); private child2Repository = AppDataSource.getRepository(OrgChild2); private child3Repository = AppDataSource.getRepository(OrgChild3); private child4Repository = AppDataSource.getRepository(OrgChild4); diff --git a/src/controllers/OrgChild4Controller.ts b/src/controllers/OrgChild4Controller.ts index f6f8b594..95fae160 100644 --- a/src/controllers/OrgChild4Controller.ts +++ b/src/controllers/OrgChild4Controller.ts @@ -5,7 +5,6 @@ import { Post, Put, Delete, - Patch, Route, Security, Tags, @@ -13,7 +12,6 @@ import { Body, Request, Example, - SuccessResponse, Response, } from "tsoa"; import HttpStatusCode from "../interfaces/http-status"; @@ -23,7 +21,6 @@ import { In } from "typeorm"; import { OrgRevision } from "../entities/OrgRevision"; import { OrgRoot } from "../entities/OrgRoot"; import { CreateOrgChild4, OrgChild4, UpdateOrgChild4 } from "../entities/OrgChild4"; -import { OrgChild1 } from "../entities/OrgChild1"; import { OrgChild3 } from "../entities/OrgChild3"; import { PosMaster } from "../entities/PosMaster"; import { Position } from "../entities/Position"; @@ -41,7 +38,6 @@ import { setLogDataDiff } from "../interfaces/utils"; "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", ) export class OrgChild4Controller extends Controller { - private orgRootRepository = AppDataSource.getRepository(OrgRoot); private child3Repository = AppDataSource.getRepository(OrgChild3); private child4Repository = AppDataSource.getRepository(OrgChild4); private posMasterRepository = AppDataSource.getRepository(PosMaster); diff --git a/src/controllers/OrgRootController.ts b/src/controllers/OrgRootController.ts index b31bac50..44b29eb8 100644 --- a/src/controllers/OrgRootController.ts +++ b/src/controllers/OrgRootController.ts @@ -4,7 +4,6 @@ import { Post, Put, Delete, - Patch, Route, Security, Tags, @@ -16,8 +15,8 @@ import { import { CreateOrgRoot, OrgRoot } from "../entities/OrgRoot"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; -import { CreateOrgChild1, OrgChild1 } from "../entities/OrgChild1"; -import { In, IsNull, Not } from "typeorm"; +import { OrgChild1 } from "../entities/OrgChild1"; +import { In, Not } from "typeorm"; import HttpError from "../interfaces/http-error"; import HttpStatusCode from "../interfaces/http-status"; import { OrgRevision } from "../entities/OrgRevision"; diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts index 763a1d3e..ee160ad0 100644 --- a/src/controllers/OrganizationController.ts +++ b/src/controllers/OrganizationController.ts @@ -9,7 +9,6 @@ import { Body, Path, Request, - SuccessResponse, Response, } from "tsoa"; import { CreateOrgRevision, OrgRevision } from "../entities/OrgRevision"; @@ -25,13 +24,11 @@ import { OrgChild3 } from "../entities/OrgChild3"; import { OrgChild4 } from "../entities/OrgChild4"; import { PosMaster } from "../entities/PosMaster"; import { Position } from "../entities/Position"; -import CallAPI from "../interfaces/call-api"; import { ProfileSalary } from "../entities/ProfileSalary"; import { Profile } from "../entities/Profile"; import { RequestWithUser } from "../middlewares/user"; import permission from "../interfaces/permission"; import { PermissionOrg } from "../entities/PermissionOrg"; -import FunctionMain from "../interfaces/functionMain"; import { setLogDataDiff } from "../interfaces/utils"; import { AuthRole } from "../entities/AuthRole"; @@ -52,9 +49,7 @@ export class OrganizationController extends Controller { private child4Repository = AppDataSource.getRepository(OrgChild4); private posMasterRepository = AppDataSource.getRepository(PosMaster); private positionRepository = AppDataSource.getRepository(Position); - private salaryRepository = AppDataSource.getRepository(ProfileSalary); private profileRepo = AppDataSource.getRepository(Profile); - private authRoleRepo = AppDataSource.getRepository(AuthRole); /** * API รายการประวัติโครงสร้าง diff --git a/src/controllers/OrganizationDotnetController.ts b/src/controllers/OrganizationDotnetController.ts index 1ed97e24..7f0a935e 100644 --- a/src/controllers/OrganizationDotnetController.ts +++ b/src/controllers/OrganizationDotnetController.ts @@ -2,7 +2,6 @@ import { Controller, Post, Put, - Delete, Route, Security, Tags, @@ -12,8 +11,6 @@ import { SuccessResponse, Response, Get, - Query, - Example, } from "tsoa"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; @@ -21,13 +18,12 @@ import HttpStatus from "../interfaces/http-status"; import HttpError from "../interfaces/http-error"; import { RequestWithUser } from "../middlewares/user"; import { Profile } from "../entities/Profile"; -import { Brackets, IsNull, Like, Not } from "typeorm"; +import { Brackets, IsNull, Not } from "typeorm"; import { OrgRevision } from "../entities/OrgRevision"; import { OrgRoot } from "../entities/OrgRoot"; import { ProfileEmployee } from "../entities/ProfileEmployee"; import { Position } from "../entities/Position"; -import { CreateInsignias, Insignia } from "../entities/Insignia"; -import { InsigniaType } from "../entities/InsigniaType"; +import { Insignia } from "../entities/Insignia"; import { CreateProfileInsignia, ProfileInsignia } from "../entities/ProfileInsignia"; @Route("api/v1/org/dotnet") @@ -44,7 +40,6 @@ export class OrganizationDotnetController extends Controller { private profileRepo = AppDataSource.getRepository(Profile); private profileEmpRepo = AppDataSource.getRepository(ProfileEmployee); private positionRepository = AppDataSource.getRepository(Position); - private insigniaMetaRepo = AppDataSource.getRepository(Insignia); private insigniaRepo = AppDataSource.getRepository(ProfileInsignia); /** diff --git a/src/controllers/OrganizationUnauthorizeController.ts b/src/controllers/OrganizationUnauthorizeController.ts index 0a40e41e..3d345f2a 100644 --- a/src/controllers/OrganizationUnauthorizeController.ts +++ b/src/controllers/OrganizationUnauthorizeController.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Post, Route, Tags, Body, Path, SuccessResponse, Response } from "tsoa"; +import { Controller, Get, Post, Route, Tags, Body, Path, Response } from "tsoa"; import { OrgRevision } from "../entities/OrgRevision"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; @@ -21,8 +21,6 @@ import { ProfileEmployee } from "../entities/ProfileEmployee"; export class OrganizationUnauthorizeController extends Controller { private orgRevisionRepository = AppDataSource.getRepository(OrgRevision); private orgRootRepository = AppDataSource.getRepository(OrgRoot); - private profileRepository = AppDataSource.getRepository(Profile); - private profileEmployeeRepository = AppDataSource.getRepository(ProfileEmployee); /** * API รายชื่อราชการที่เลื่อนเงินเดือน (unauthorize) diff --git a/src/controllers/PermissionController.ts b/src/controllers/PermissionController.ts index 0b10b738..430e62ea 100644 --- a/src/controllers/PermissionController.ts +++ b/src/controllers/PermissionController.ts @@ -1,4 +1,4 @@ -import { Body, Controller, Get, Path, Post, Request, Route, Security, Tags } from "tsoa"; +import { Controller, Get, Path, Request, Route, Security, Tags } from "tsoa"; import { AppDataSource } from "../database/data-source"; import { RequestWithUser } from "../middlewares/user"; import HttpError from "../interfaces/http-error"; diff --git a/src/controllers/PermissionOrgController.ts b/src/controllers/PermissionOrgController.ts index ade79359..d261ba65 100644 --- a/src/controllers/PermissionOrgController.ts +++ b/src/controllers/PermissionOrgController.ts @@ -1,7 +1,6 @@ import { Controller, Post, - Put, Delete, Route, Security, @@ -9,7 +8,6 @@ import { Body, Path, Request, - SuccessResponse, Response, Get, Query, @@ -18,17 +16,13 @@ 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 { Not } from "typeorm"; import { OrgRoot } from "../entities/OrgRoot"; import { OrgRevision } from "../entities/OrgRevision"; import { RequestWithUser } from "../middlewares/user"; import { PermissionOrg } from "../entities/PermissionOrg"; import { Profile } from "../entities/Profile"; import HttpStatus from "../interfaces/http-status"; -import permission from "../interfaces/permission"; import { PosMaster } from "../entities/PosMaster"; -import { EmployeePosMaster } from "../entities/EmployeePosMaster"; -import { ProfileEmployee } from "../entities/ProfileEmployee"; import { setLogDataDiff } from "../interfaces/utils"; @Route("api/v1/org/permission-org") @@ -44,9 +38,7 @@ export class PermissionOrgController extends Controller { private orgRevisionRepository = AppDataSource.getRepository(OrgRevision); private permissionOrgRepository = AppDataSource.getRepository(PermissionOrg); private posMasterRepository = AppDataSource.getRepository(PosMaster); - private posMasterEmpRepository = AppDataSource.getRepository(EmployeePosMaster); private profileRepo = AppDataSource.getRepository(Profile); - private profileEmployeeRepo = AppDataSource.getRepository(ProfileEmployee); /** * API หาสำนักทั้งหมดแบบร่าง diff --git a/src/controllers/PosExecutiveController.ts b/src/controllers/PosExecutiveController.ts index 9a81e3db..9afa88a8 100644 --- a/src/controllers/PosExecutiveController.ts +++ b/src/controllers/PosExecutiveController.ts @@ -9,7 +9,6 @@ import { Body, Path, Request, - SuccessResponse, Response, Get, Example, @@ -22,7 +21,6 @@ import HttpError from "../interfaces/http-error"; import { CreatePosExecutive, PosExecutive } from "../entities/PosExecutive"; import { Position } from "../entities/Position"; import { RequestWithUser } from "../middlewares/user"; -import { after } from "node:test"; import { setLogDataDiff } from "../interfaces/utils"; @Route("api/v1/org/pos/executive") @Tags("PosExecutive") diff --git a/src/controllers/PosLevelController.ts b/src/controllers/PosLevelController.ts index df6845ae..45c7bba7 100644 --- a/src/controllers/PosLevelController.ts +++ b/src/controllers/PosLevelController.ts @@ -4,7 +4,6 @@ import { Post, Put, Delete, - Patch, Route, Security, Tags, @@ -12,9 +11,7 @@ import { Path, Request, Example, - SuccessResponse, Response, - Query, } from "tsoa"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; diff --git a/src/controllers/PosMasterActController.ts b/src/controllers/PosMasterActController.ts index 64ae1c03..48c07468 100644 --- a/src/controllers/PosMasterActController.ts +++ b/src/controllers/PosMasterActController.ts @@ -9,13 +9,11 @@ import { Body, Path, Request, - SuccessResponse, Response, } from "tsoa"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; import HttpStatusCode from "../interfaces/http-status"; -import { PosLevel, CreatePosLevel } from "../entities/PosLevel"; import HttpError from "../interfaces/http-error"; import { PosMasterAct } from "../entities/PosMasterAct"; import { PosMaster } from "../entities/PosMaster"; diff --git a/src/controllers/PosTypeController.ts b/src/controllers/PosTypeController.ts index 62e0d73b..14573a70 100644 --- a/src/controllers/PosTypeController.ts +++ b/src/controllers/PosTypeController.ts @@ -4,7 +4,6 @@ import { Post, Put, Delete, - Patch, Route, Security, Tags, @@ -12,9 +11,7 @@ import { Path, Request, Example, - SuccessResponse, Response, - Query, } from "tsoa"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; @@ -35,7 +32,6 @@ import { RequestWithUser } from "../middlewares/user"; ) export class PosTypeController extends Controller { private posTypeRepository = AppDataSource.getRepository(PosType); - private posLevelRepository = AppDataSource.getRepository(PosLevel); /** * API เพิ่มประเภทตำแหน่ง diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts index 1d4cb0bb..22e48fec 100644 --- a/src/controllers/PositionController.ts +++ b/src/controllers/PositionController.ts @@ -4,7 +4,6 @@ import { Post, Put, Delete, - Patch, Route, Security, Tags, @@ -12,7 +11,6 @@ import { Path, Request, Example, - SuccessResponse, Response, Query, } from "tsoa"; @@ -24,7 +22,7 @@ import { PosType } from "../entities/PosType"; import { PosLevel } from "../entities/PosLevel"; import { CreatePosDict, CreatePosDictExe, PosDict, UpdatePosDict } from "../entities/PosDict"; import HttpError from "../interfaces/http-error"; -import { Equal, ILike, In, IsNull, Like, Not, Brackets, MoreThan } from "typeorm"; +import { In, IsNull, Like, Not, Brackets } from "typeorm"; import { CreatePosMaster, PosMaster } from "../entities/PosMaster"; import { OrgRevision } from "../entities/OrgRevision"; import { OrgRoot } from "../entities/OrgRoot"; @@ -40,10 +38,8 @@ import { EmployeePosLevel } from "../entities/EmployeePosLevel"; import { AuthRole } from "../entities/AuthRole"; import { RequestWithUser } from "../middlewares/user"; import permission from "../interfaces/permission"; -import { request } from "axios"; import { setLogDataDiff } from "../interfaces/utils"; import { PosMasterAssign } from "../entities/PosMasterAssign"; -import { CommandSys } from "../entities/CommandSys"; import { Assign } from "../entities/Assign"; @Route("api/v1/org/pos") @Tags("Position") @@ -4151,6 +4147,7 @@ export class PositionController extends Controller { positionName: position?.positionName || null, posType: position?.posType?.posTypeName || null, posLevel: position?.posLevel?.posLevelName || null, + profileId: x.next_holder?.id || null, prefix: x.next_holder?.prefix || null, firstName: x.next_holder?.firstName || null, lastName: x.next_holder?.lastName || null, diff --git a/src/controllers/PrefixController.ts b/src/controllers/PrefixController.ts index 5d3d5fa6..ff0cb461 100644 --- a/src/controllers/PrefixController.ts +++ b/src/controllers/PrefixController.ts @@ -9,7 +9,6 @@ import { Body, Path, Request, - SuccessResponse, Response, Get, } from "tsoa"; @@ -21,7 +20,6 @@ import { Prefixe, CreatePrefixe, UpdatePrefixe } from "../entities/Prefixe"; import { Not } from "typeorm"; import { setLogDataDiff } from "../interfaces/utils"; import { RequestWithUser } from "../middlewares/user"; -import { request } from "axios"; @Route("api/v1/org/metadata/prefix") @Tags("Prefix") diff --git a/src/controllers/WorkflowController.ts b/src/controllers/WorkflowController.ts index c25b2446..c5d447ed 100644 --- a/src/controllers/WorkflowController.ts +++ b/src/controllers/WorkflowController.ts @@ -546,34 +546,23 @@ export class WorkflowController extends Controller { @Request() req: RequestWithUser, @Body() body: { - stateId: string; + stateUserCommentId: string; isAccept?: boolean | null; isApprove?: boolean | null; reason?: string | null; }, ) { - const profile = await this.profileRepo.findOne({ + const stateUserComment = await this.stateUserCommentRepo.findOne({ where: { - keycloak: req.user.sub, + id: body.stateUserCommentId, }, }); - if (!profile) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลผู้ใช้งาน"); - const state = await this.stateRepo.findOne({ - where: { - id: body.stateId, - }, - }); - if (!state) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลขั้นตอนการอนุมัติ"); + if (!stateUserComment) + throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลขั้นตอนการอนุมัติ"); let _null: any = null; - const stateUserComment = new StateUserComment(); - stateUserComment.stateId = body.stateId; - stateUserComment.profileId = profile.id; stateUserComment.isAccept = body.isAccept == null ? _null : body.isAccept; stateUserComment.isApprove = body.isApprove == null ? _null : body.isAccept; stateUserComment.reason = body.reason == null ? _null : body.isAccept; - stateUserComment.createdUserId = req.user.sub; - stateUserComment.createdFullName = req.user.name; - stateUserComment.createdAt = new Date(); stateUserComment.lastUpdateUserId = req.user.sub; stateUserComment.lastUpdateFullName = req.user.name; stateUserComment.lastUpdatedAt = new Date(); @@ -620,6 +609,7 @@ export class WorkflowController extends Controller { }); return new HttpSuccess({ + id: stateUserComment?.id || null, isAccept: stateUserComment?.isAccept || null, isApprove: stateUserComment?.isApprove || null, reason: stateUserComment?.reason || null, diff --git a/src/entities/PosLevel.ts b/src/entities/PosLevel.ts index 7eb67e93..d738c87a 100644 --- a/src/entities/PosLevel.ts +++ b/src/entities/PosLevel.ts @@ -1,11 +1,9 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; import { EntityBase } from "./base/Base"; import { PosType } from "./PosType"; import { Position } from "./Position"; import { PosDict } from "./PosDict"; import { Profile } from "./Profile"; -import { profile } from "console"; -import { Workflow } from "./Workflow"; enum PosLevelAuthority { HEAD = "HEAD", @@ -57,9 +55,6 @@ export class PosLevel extends EntityBase { @OneToMany(() => Profile, (profile) => profile.posLevel) profiles: Profile[]; - -// @OneToMany(() => Workflow, (workflow) => workflow.posLevel) -// workflows: Workflow[]; } export class CreatePosLevel { diff --git a/src/entities/PosType.ts b/src/entities/PosType.ts index 9abb9633..ca8e53aa 100644 --- a/src/entities/PosType.ts +++ b/src/entities/PosType.ts @@ -1,10 +1,9 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm"; +import { Entity, Column, OneToMany } from "typeorm"; import { EntityBase } from "./base/Base"; import { PosLevel } from "./PosLevel"; import { Position } from "./Position"; import { PosDict } from "./PosDict"; import { Profile } from "./Profile"; -import { Workflow } from "./Workflow"; @Entity("posType") export class PosType extends EntityBase { @@ -35,9 +34,6 @@ export class PosType extends EntityBase { @OneToMany(() => Profile, (profile) => profile.posType) profiles: Profile[]; - - // @OneToMany(() => Workflow, (workflow) => workflow.posType) - // workflows: Workflow[]; } export class CreatePosType { From 3c0a39a8c4e1ee559d81052d67a873d0889fd89e Mon Sep 17 00:00:00 2001 From: kittapath Date: Fri, 18 Oct 2024 11:45:16 +0700 Subject: [PATCH 09/10] no message --- .../ProfileEmployeeTempController.ts | 1 - .../ProfileFamilyCoupleEmployeeController.ts | 14 +------------ ...ofileFamilyCoupleEmployeeTempController.ts | 14 +------------ .../ProfileFamilyFatherController.ts | 14 +------------ .../ProfileFamilyFatherEmployeeController.ts | 14 +------------ ...ofileFamilyFatherEmployeeTempController.ts | 14 +------------ .../ProfileFamilyMotherController.ts | 14 +------------ .../ProfileFamilyMotherEmployeeController.ts | 14 +------------ ...ofileFamilyMotherEmployeeTempController.ts | 14 +------------ .../ProfileGovernmentEmployeeController.ts | 21 ++----------------- ...ProfileGovernmentEmployeeTempController.ts | 21 ++----------------- .../ProfileOtherEmployeeTempController.ts | 1 - src/controllers/ProfileSalaryController.ts | 1 - .../ProfileTrainingEmployeeController.ts | 1 - .../ProfileTrainingEmployeeTempController.ts | 1 - src/controllers/ProvinceController.ts | 1 - src/controllers/RankController.ts | 1 - src/controllers/RelationshipController.ts | 2 -- src/controllers/ReligionController.ts | 1 - src/controllers/SubDistrictController.ts | 1 - src/controllers/UserController.ts | 4 ---- src/controllers/WorkflowController.ts | 4 ++-- src/entities/Assign.ts | 1 - src/entities/AuthRole.ts | 2 +- src/entities/AuthRoleAttr.ts | 2 +- src/entities/BloodGroup.ts | 4 +--- src/entities/ChangePosition.ts | 2 +- src/entities/CommandRecive.ts | 2 +- src/entities/CommandSys.ts | 1 - src/entities/Gender.ts | 4 +--- src/entities/HR_EDUCATION.ts | 2 +- src/entities/HR_EDUCATION_EMP.ts | 2 +- src/entities/HR_PERSONAL_EMP_ADDRESS.ts | 2 +- src/entities/HR_PERSONAL_EMP_FAMILY.ts | 2 +- src/entities/HR_PERSONAL_OFFICER_ADDRESS.ts | 2 +- src/entities/HR_PERSONAL_OFFICER_FAMILY.ts | 2 +- src/entities/HR_POSITION_OFFICER.ts | 2 +- 37 files changed, 27 insertions(+), 178 deletions(-) diff --git a/src/controllers/ProfileEmployeeTempController.ts b/src/controllers/ProfileEmployeeTempController.ts index 10a1f9f9..cc096c45 100644 --- a/src/controllers/ProfileEmployeeTempController.ts +++ b/src/controllers/ProfileEmployeeTempController.ts @@ -62,7 +62,6 @@ import { } from "../entities/ProfileEmployeeEmployment"; import { ProfileEmployeeEmploymentHistory } from "../entities/ProfileEmployeeEmploymentHistory"; import CallAPI from "../interfaces/call-api"; -import { EmployeePosition } from "../entities/EmployeePosition"; import { ProfileInsignia } from "../entities/ProfileInsignia"; import { ProfileLeave } from "../entities/ProfileLeave"; import permission from "../interfaces/permission"; diff --git a/src/controllers/ProfileFamilyCoupleEmployeeController.ts b/src/controllers/ProfileFamilyCoupleEmployeeController.ts index be5b2e79..236bfc27 100644 --- a/src/controllers/ProfileFamilyCoupleEmployeeController.ts +++ b/src/controllers/ProfileFamilyCoupleEmployeeController.ts @@ -1,16 +1,4 @@ -import { - Body, - Controller, - Example, - Get, - Patch, - Path, - Post, - Request, - Route, - Security, - Tags, -} from "tsoa"; +import { Body, Controller, Get, Patch, Path, Post, Request, Route, Security, Tags } from "tsoa"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; import HttpStatus from "../interfaces/http-status"; diff --git a/src/controllers/ProfileFamilyCoupleEmployeeTempController.ts b/src/controllers/ProfileFamilyCoupleEmployeeTempController.ts index 55262930..331cd829 100644 --- a/src/controllers/ProfileFamilyCoupleEmployeeTempController.ts +++ b/src/controllers/ProfileFamilyCoupleEmployeeTempController.ts @@ -1,16 +1,4 @@ -import { - Body, - Controller, - Example, - Get, - Patch, - Path, - Post, - Request, - Route, - Security, - Tags, -} from "tsoa"; +import { Body, Controller, Get, Patch, Path, Post, Request, Route, Security, Tags } from "tsoa"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; import HttpStatus from "../interfaces/http-status"; diff --git a/src/controllers/ProfileFamilyFatherController.ts b/src/controllers/ProfileFamilyFatherController.ts index 2a8ea184..2ab32ec5 100644 --- a/src/controllers/ProfileFamilyFatherController.ts +++ b/src/controllers/ProfileFamilyFatherController.ts @@ -1,16 +1,4 @@ -import { - Body, - Controller, - Example, - Get, - Patch, - Path, - Post, - Request, - Route, - Security, - Tags, -} from "tsoa"; +import { Body, Controller, Get, Patch, Path, Post, Request, Route, Security, Tags } from "tsoa"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; import HttpStatus from "../interfaces/http-status"; diff --git a/src/controllers/ProfileFamilyFatherEmployeeController.ts b/src/controllers/ProfileFamilyFatherEmployeeController.ts index 3bd3f44d..2fcf5ed0 100644 --- a/src/controllers/ProfileFamilyFatherEmployeeController.ts +++ b/src/controllers/ProfileFamilyFatherEmployeeController.ts @@ -1,16 +1,4 @@ -import { - Body, - Controller, - Example, - Get, - Patch, - Path, - Post, - Request, - Route, - Security, - Tags, -} from "tsoa"; +import { Body, Controller, Get, Patch, Path, Post, Request, Route, Security, Tags } from "tsoa"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; import HttpStatus from "../interfaces/http-status"; diff --git a/src/controllers/ProfileFamilyFatherEmployeeTempController.ts b/src/controllers/ProfileFamilyFatherEmployeeTempController.ts index 3436df28..6fe38d9b 100644 --- a/src/controllers/ProfileFamilyFatherEmployeeTempController.ts +++ b/src/controllers/ProfileFamilyFatherEmployeeTempController.ts @@ -1,16 +1,4 @@ -import { - Body, - Controller, - Example, - Get, - Patch, - Path, - Post, - Request, - Route, - Security, - Tags, -} from "tsoa"; +import { Body, Controller, Get, Patch, Path, Post, Request, Route, Security, Tags } from "tsoa"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; import HttpStatus from "../interfaces/http-status"; diff --git a/src/controllers/ProfileFamilyMotherController.ts b/src/controllers/ProfileFamilyMotherController.ts index 00c8e9b8..cf9ce87a 100644 --- a/src/controllers/ProfileFamilyMotherController.ts +++ b/src/controllers/ProfileFamilyMotherController.ts @@ -1,16 +1,4 @@ -import { - Body, - Controller, - Example, - Get, - Patch, - Path, - Post, - Request, - Route, - Security, - Tags, -} from "tsoa"; +import { Body, Controller, Get, Patch, Path, Post, Request, Route, Security, Tags } from "tsoa"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; import HttpStatus from "../interfaces/http-status"; diff --git a/src/controllers/ProfileFamilyMotherEmployeeController.ts b/src/controllers/ProfileFamilyMotherEmployeeController.ts index 1afe0344..f0b34986 100644 --- a/src/controllers/ProfileFamilyMotherEmployeeController.ts +++ b/src/controllers/ProfileFamilyMotherEmployeeController.ts @@ -1,16 +1,4 @@ -import { - Body, - Controller, - Example, - Get, - Patch, - Path, - Post, - Request, - Route, - Security, - Tags, -} from "tsoa"; +import { Body, Controller, Get, Patch, Path, Post, Request, Route, Security, Tags } from "tsoa"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; import HttpStatus from "../interfaces/http-status"; diff --git a/src/controllers/ProfileFamilyMotherEmployeeTempController.ts b/src/controllers/ProfileFamilyMotherEmployeeTempController.ts index 6884cd5d..102170b9 100644 --- a/src/controllers/ProfileFamilyMotherEmployeeTempController.ts +++ b/src/controllers/ProfileFamilyMotherEmployeeTempController.ts @@ -1,16 +1,4 @@ -import { - Body, - Controller, - Example, - Get, - Patch, - Path, - Post, - Request, - Route, - Security, - Tags, -} from "tsoa"; +import { Body, Controller, Get, Patch, Path, Post, Request, Route, Security, Tags } from "tsoa"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; import HttpStatus from "../interfaces/http-status"; diff --git a/src/controllers/ProfileGovernmentEmployeeController.ts b/src/controllers/ProfileGovernmentEmployeeController.ts index 0a1d3265..0ca52f83 100644 --- a/src/controllers/ProfileGovernmentEmployeeController.ts +++ b/src/controllers/ProfileGovernmentEmployeeController.ts @@ -1,28 +1,11 @@ -import { - Body, - Controller, - Example, - Get, - Patch, - Path, - Delete, - Post, - Request, - Route, - Security, - Tags, -} from "tsoa"; +import { Body, Controller, Example, Get, Patch, Path, Request, Route, Security, Tags } from "tsoa"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; import HttpStatus from "../interfaces/http-status"; import HttpError from "../interfaces/http-error"; import { RequestWithUser } from "../middlewares/user"; import { ProfileEmployee } from "../entities/ProfileEmployee"; -import { - CreateProfileEmployeeGovernment, - ProfileGovernment, - UpdateProfileGovernment, -} from "../entities/ProfileGovernment"; +import { ProfileGovernment, UpdateProfileGovernment } from "../entities/ProfileGovernment"; import { EmployeePosition } from "../entities/EmployeePosition"; import { EmployeePosMaster } from "../entities/EmployeePosMaster"; import { calculateAge, calculateRetireDate, setLogDataDiff } from "../interfaces/utils"; diff --git a/src/controllers/ProfileGovernmentEmployeeTempController.ts b/src/controllers/ProfileGovernmentEmployeeTempController.ts index d6e60fb3..b5b49944 100644 --- a/src/controllers/ProfileGovernmentEmployeeTempController.ts +++ b/src/controllers/ProfileGovernmentEmployeeTempController.ts @@ -1,28 +1,11 @@ -import { - Body, - Controller, - Example, - Get, - Patch, - Path, - Delete, - Post, - Request, - Route, - Security, - Tags, -} from "tsoa"; +import { Body, Controller, Example, Get, Patch, Path, Request, Route, Security, Tags } from "tsoa"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; import HttpStatus from "../interfaces/http-status"; import HttpError from "../interfaces/http-error"; import { RequestWithUser } from "../middlewares/user"; import { ProfileEmployee } from "../entities/ProfileEmployee"; -import { - CreateProfileEmployeeGovernment, - ProfileGovernment, - UpdateProfileGovernment, -} from "../entities/ProfileGovernment"; +import { ProfileGovernment, UpdateProfileGovernment } from "../entities/ProfileGovernment"; import { EmployeePosition } from "../entities/EmployeePosition"; import { EmployeePosMaster } from "../entities/EmployeePosMaster"; import { calculateAge, calculateRetireDate, setLogDataDiff } from "../interfaces/utils"; diff --git a/src/controllers/ProfileOtherEmployeeTempController.ts b/src/controllers/ProfileOtherEmployeeTempController.ts index 5911d17b..dfc7b00c 100644 --- a/src/controllers/ProfileOtherEmployeeTempController.ts +++ b/src/controllers/ProfileOtherEmployeeTempController.ts @@ -2,7 +2,6 @@ import { Body, Controller, Delete, - Example, Get, Patch, Path, diff --git a/src/controllers/ProfileSalaryController.ts b/src/controllers/ProfileSalaryController.ts index e35dc280..a7fbea2c 100644 --- a/src/controllers/ProfileSalaryController.ts +++ b/src/controllers/ProfileSalaryController.ts @@ -2,7 +2,6 @@ import { Body, Controller, Delete, - Example, Get, Patch, Path, diff --git a/src/controllers/ProfileTrainingEmployeeController.ts b/src/controllers/ProfileTrainingEmployeeController.ts index 88fd61d7..cd1d0f41 100644 --- a/src/controllers/ProfileTrainingEmployeeController.ts +++ b/src/controllers/ProfileTrainingEmployeeController.ts @@ -2,7 +2,6 @@ import { Body, Controller, Delete, - Example, Get, Patch, Path, diff --git a/src/controllers/ProfileTrainingEmployeeTempController.ts b/src/controllers/ProfileTrainingEmployeeTempController.ts index 8cbe6183..324f60c0 100644 --- a/src/controllers/ProfileTrainingEmployeeTempController.ts +++ b/src/controllers/ProfileTrainingEmployeeTempController.ts @@ -2,7 +2,6 @@ import { Body, Controller, Delete, - Example, Get, Patch, Path, diff --git a/src/controllers/ProvinceController.ts b/src/controllers/ProvinceController.ts index 24142a45..56433c93 100644 --- a/src/controllers/ProvinceController.ts +++ b/src/controllers/ProvinceController.ts @@ -9,7 +9,6 @@ import { Body, Path, Request, - SuccessResponse, Response, Get, } from "tsoa"; diff --git a/src/controllers/RankController.ts b/src/controllers/RankController.ts index adc8fe6f..a23f9692 100644 --- a/src/controllers/RankController.ts +++ b/src/controllers/RankController.ts @@ -9,7 +9,6 @@ import { Body, Path, Request, - SuccessResponse, Response, Get, } from "tsoa"; diff --git a/src/controllers/RelationshipController.ts b/src/controllers/RelationshipController.ts index 2c3da7d8..0d446a98 100644 --- a/src/controllers/RelationshipController.ts +++ b/src/controllers/RelationshipController.ts @@ -9,7 +9,6 @@ import { Body, Path, Request, - SuccessResponse, Response, Get, } from "tsoa"; @@ -21,7 +20,6 @@ import { CreateRelationship, Relationship } from "../entities/Relationship"; import { Not } from "typeorm"; import { RequestWithUser } from "../middlewares/user"; import { setLogDataDiff } from "../interfaces/utils"; -import { request } from "axios"; @Route("api/v1/org/metadata/relationship") @Tags("Relationship") @Security("bearerAuth") diff --git a/src/controllers/ReligionController.ts b/src/controllers/ReligionController.ts index 624ed6f5..baf1a821 100644 --- a/src/controllers/ReligionController.ts +++ b/src/controllers/ReligionController.ts @@ -9,7 +9,6 @@ import { Body, Path, Request, - SuccessResponse, Response, Get, } from "tsoa"; diff --git a/src/controllers/SubDistrictController.ts b/src/controllers/SubDistrictController.ts index 2e212fc9..8c329354 100644 --- a/src/controllers/SubDistrictController.ts +++ b/src/controllers/SubDistrictController.ts @@ -9,7 +9,6 @@ import { Body, Path, Request, - SuccessResponse, Response, Get, } from "tsoa"; diff --git a/src/controllers/UserController.ts b/src/controllers/UserController.ts index bb6ece7d..c04b82c5 100644 --- a/src/controllers/UserController.ts +++ b/src/controllers/UserController.ts @@ -30,15 +30,11 @@ import { getRoleMappings, getUserCount, enableStatus, - getUserCountOrg, - getUserListOrg, } from "../keycloak"; import { AppDataSource } from "../database/data-source"; import { Profile } from "../entities/Profile"; import { ProfileEmployee } from "../entities/ProfileEmployee"; -import { IsNull, Not } from "typeorm"; import { RequestWithUser } from "../middlewares/user"; -import permission from "../interfaces/permission"; // import * as io from "../lib/websocket"; // import elasticsearch from "../elasticsearch"; // import { StorageFolder } from "../interfaces/storage-fs"; diff --git a/src/controllers/WorkflowController.ts b/src/controllers/WorkflowController.ts index c5d447ed..3619f4bc 100644 --- a/src/controllers/WorkflowController.ts +++ b/src/controllers/WorkflowController.ts @@ -561,8 +561,8 @@ export class WorkflowController extends Controller { throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลขั้นตอนการอนุมัติ"); let _null: any = null; stateUserComment.isAccept = body.isAccept == null ? _null : body.isAccept; - stateUserComment.isApprove = body.isApprove == null ? _null : body.isAccept; - stateUserComment.reason = body.reason == null ? _null : body.isAccept; + stateUserComment.isApprove = body.isApprove == null ? _null : body.isApprove; + stateUserComment.reason = body.reason == null ? _null : body.reason; stateUserComment.lastUpdateUserId = req.user.sub; stateUserComment.lastUpdateFullName = req.user.name; stateUserComment.lastUpdatedAt = new Date(); diff --git a/src/entities/Assign.ts b/src/entities/Assign.ts index ea331d01..96dbaf75 100644 --- a/src/entities/Assign.ts +++ b/src/entities/Assign.ts @@ -8,7 +8,6 @@ import { ManyToOne, JoinColumn, } from "typeorm"; -import { CommandType } from "./CommandType"; import { PosMasterAssign } from "./PosMasterAssign"; import { CommandSys } from "./CommandSys"; diff --git a/src/entities/AuthRole.ts b/src/entities/AuthRole.ts index e6de3abc..d3df0a36 100644 --- a/src/entities/AuthRole.ts +++ b/src/entities/AuthRole.ts @@ -1,4 +1,4 @@ -import { Entity, Column, OneToMany, OneToOne } from "typeorm"; +import { Entity, Column, OneToMany } from "typeorm"; import { EntityBase } from "./base/Base"; import { AuthRoleAttr } from "./AuthRoleAttr"; import { PosMaster } from "./PosMaster"; diff --git a/src/entities/AuthRoleAttr.ts b/src/entities/AuthRoleAttr.ts index 429d926c..ec77ddd7 100644 --- a/src/entities/AuthRoleAttr.ts +++ b/src/entities/AuthRoleAttr.ts @@ -1,4 +1,4 @@ -import { Entity, Column, OneToMany, ManyToOne, JoinColumn } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { AuthSys } from "./AuthSys"; import { AuthRole } from "./AuthRole"; diff --git a/src/entities/BloodGroup.ts b/src/entities/BloodGroup.ts index 3a65fb35..0b2a0c6a 100644 --- a/src/entities/BloodGroup.ts +++ b/src/entities/BloodGroup.ts @@ -1,7 +1,5 @@ -import { Entity, Column, OneToMany } from "typeorm"; +import { Entity, Column } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; -import { ProfileEmployee } from "./ProfileEmployee"; @Entity("bloodGroup") export class BloodGroup extends EntityBase { diff --git a/src/entities/ChangePosition.ts b/src/entities/ChangePosition.ts index 907ef018..cb085324 100644 --- a/src/entities/ChangePosition.ts +++ b/src/entities/ChangePosition.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; +import { Entity, Column, OneToMany } from "typeorm"; import { EntityBase } from "./base/Base"; import { ProfileChangePosition } from "./ProfileChangePosition"; diff --git a/src/entities/CommandRecive.ts b/src/entities/CommandRecive.ts index d719b6bd..2e9c62d6 100644 --- a/src/entities/CommandRecive.ts +++ b/src/entities/CommandRecive.ts @@ -1,4 +1,4 @@ -import { Entity, Column, JoinColumn, ManyToOne, OneToMany, Double } from "typeorm"; +import { Entity, Column, JoinColumn, ManyToOne, Double } from "typeorm"; import { EntityBase } from "./base/Base"; import { Command } from "./Command"; diff --git a/src/entities/CommandSys.ts b/src/entities/CommandSys.ts index 7e50f3ae..0e7634b3 100644 --- a/src/entities/CommandSys.ts +++ b/src/entities/CommandSys.ts @@ -9,7 +9,6 @@ import { import { CommandType } from "./CommandType"; import { CommandSalary } from "./CommandSalary"; import { Assign } from "./Assign"; -import { Workflow } from "./Workflow"; @Entity("commandSys") export class CommandSys { diff --git a/src/entities/Gender.ts b/src/entities/Gender.ts index 34c1c799..b3e8dda2 100644 --- a/src/entities/Gender.ts +++ b/src/entities/Gender.ts @@ -1,7 +1,5 @@ -import { Entity, Column, OneToMany } from "typeorm"; +import { Entity, Column } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; -import { ProfileEmployee } from "./ProfileEmployee"; @Entity("gender") export class Gender extends EntityBase { diff --git a/src/entities/HR_EDUCATION.ts b/src/entities/HR_EDUCATION.ts index 0bf28924..1101b60f 100644 --- a/src/entities/HR_EDUCATION.ts +++ b/src/entities/HR_EDUCATION.ts @@ -1,4 +1,4 @@ -import { Entity, Column, OneToMany, OneToOne, PrimaryGeneratedColumn } from "typeorm"; +import { Entity, Column, PrimaryGeneratedColumn } from "typeorm"; @Entity("HR_EDUCATION") export class HR_EDUCATION { diff --git a/src/entities/HR_EDUCATION_EMP.ts b/src/entities/HR_EDUCATION_EMP.ts index ea6f6e42..add09acb 100644 --- a/src/entities/HR_EDUCATION_EMP.ts +++ b/src/entities/HR_EDUCATION_EMP.ts @@ -1,4 +1,4 @@ -import { Entity, Column, OneToMany, OneToOne, PrimaryGeneratedColumn } from "typeorm"; +import { Entity, Column, PrimaryGeneratedColumn } from "typeorm"; @Entity("HR_EDUCATION_EMP") export class HR_EDUCATION_EMP { diff --git a/src/entities/HR_PERSONAL_EMP_ADDRESS.ts b/src/entities/HR_PERSONAL_EMP_ADDRESS.ts index 9f4a4060..ac66e666 100644 --- a/src/entities/HR_PERSONAL_EMP_ADDRESS.ts +++ b/src/entities/HR_PERSONAL_EMP_ADDRESS.ts @@ -1,4 +1,4 @@ -import { Entity, Column, OneToMany, OneToOne, PrimaryGeneratedColumn } from "typeorm"; +import { Entity, Column, PrimaryGeneratedColumn } from "typeorm"; @Entity("HR_PERSONAL_EMP_ADDRESS") export class HR_PERSONAL_EMP_ADDRESS { diff --git a/src/entities/HR_PERSONAL_EMP_FAMILY.ts b/src/entities/HR_PERSONAL_EMP_FAMILY.ts index 94be8567..f27574de 100644 --- a/src/entities/HR_PERSONAL_EMP_FAMILY.ts +++ b/src/entities/HR_PERSONAL_EMP_FAMILY.ts @@ -1,4 +1,4 @@ -import { Entity, Column, OneToMany, OneToOne, PrimaryGeneratedColumn } from "typeorm"; +import { Entity, Column, PrimaryGeneratedColumn } from "typeorm"; @Entity("HR_PERSONAL_EMP_FAMILY") export class HR_PERSONAL_EMP_FAMILY { diff --git a/src/entities/HR_PERSONAL_OFFICER_ADDRESS.ts b/src/entities/HR_PERSONAL_OFFICER_ADDRESS.ts index 23eea039..ad253be9 100644 --- a/src/entities/HR_PERSONAL_OFFICER_ADDRESS.ts +++ b/src/entities/HR_PERSONAL_OFFICER_ADDRESS.ts @@ -1,4 +1,4 @@ -import { Entity, Column, OneToMany, OneToOne, PrimaryGeneratedColumn } from "typeorm"; +import { Entity, Column, PrimaryGeneratedColumn } from "typeorm"; @Entity("HR_PERSONAL_OFFICER_ADDRESS") export class HR_PERSONAL_OFFICER_ADDRESS { diff --git a/src/entities/HR_PERSONAL_OFFICER_FAMILY.ts b/src/entities/HR_PERSONAL_OFFICER_FAMILY.ts index c772ed39..9f334e09 100644 --- a/src/entities/HR_PERSONAL_OFFICER_FAMILY.ts +++ b/src/entities/HR_PERSONAL_OFFICER_FAMILY.ts @@ -1,4 +1,4 @@ -import { Entity, Column, OneToMany, OneToOne, PrimaryGeneratedColumn } from "typeorm"; +import { Entity, Column, PrimaryGeneratedColumn } from "typeorm"; @Entity("HR_PERSONAL_OFFICER_FAMILY") export class HR_PERSONAL_OFFICER_FAMILY { diff --git a/src/entities/HR_POSITION_OFFICER.ts b/src/entities/HR_POSITION_OFFICER.ts index 8e8ff97d..02364867 100644 --- a/src/entities/HR_POSITION_OFFICER.ts +++ b/src/entities/HR_POSITION_OFFICER.ts @@ -1,4 +1,4 @@ -import { Entity, Column, OneToMany, OneToOne, PrimaryGeneratedColumn } from "typeorm"; +import { Entity, Column, PrimaryGeneratedColumn } from "typeorm"; @Entity("HR_POSITION_OFFICER") export class HR_POSITION_OFFICER { From c7ef7be3b8143e85af45e25de55e8894d20d8816 Mon Sep 17 00:00:00 2001 From: kittapath Date: Fri, 18 Oct 2024 11:52:35 +0700 Subject: [PATCH 10/10] =?UTF-8?q?=E0=B8=A5=E0=B8=9A=20import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entities/LeaveType.ts | 1 - src/entities/MetaStateOperator.ts | 2 +- src/entities/OrgChild1.ts | 2 +- src/entities/OrgChild2.ts | 2 +- src/entities/OrgChild4.ts | 2 +- src/entities/OrgRevision.ts | 2 +- src/entities/OrgRoot.ts | 3 +-- src/entities/PosDict.ts | 2 +- src/entities/PosExecutive.ts | 2 +- src/entities/Position.ts | 2 +- src/entities/Profile.ts | 2 +- src/entities/ProfileAbilityHistory.ts | 1 - src/entities/ProfileAssessmentHistory.ts | 1 - src/entities/ProfileCertificateHistory.ts | 3 +-- src/entities/ProfileChangeName.ts | 1 - src/entities/ProfileChangeNameHistory.ts | 3 +-- src/entities/ProfileChildrenHistory.ts | 4 +--- src/entities/ProfileDisciplineHistory.ts | 1 - src/entities/ProfileDutyHistory.ts | 1 - src/entities/ProfileEdit.ts | 2 +- src/entities/ProfileEducationHistory.ts | 1 - src/entities/ProfileEmployee.ts | 2 +- src/entities/ProfileFamily.ts | 2 +- src/entities/ProfileFamilyCoupleHistory.ts | 2 +- src/entities/ProfileFamilyFatherHistory.ts | 2 +- src/entities/ProfileFamilyMotherHistory.ts | 2 +- src/entities/ProfileHonorHistory.ts | 1 - src/entities/ProfileInsigniaHistory.ts | 2 +- src/entities/ProfileNopaidHistory.ts | 3 +-- src/entities/ProfileTrainingHistory.ts | 3 +-- src/entities/Relationship.ts | 5 +---- src/entities/Religion.ts | 4 +--- src/entities/StateOperator.ts | 3 +-- 33 files changed, 25 insertions(+), 46 deletions(-) diff --git a/src/entities/LeaveType.ts b/src/entities/LeaveType.ts index 86ae595c..e723ee5f 100644 --- a/src/entities/LeaveType.ts +++ b/src/entities/LeaveType.ts @@ -1,6 +1,5 @@ import { Entity, Column, OneToMany } from "typeorm"; import { EntityBase } from "./base/Base"; - import { ProfileLeave } from "./ProfileLeave"; @Entity("leaveType") diff --git a/src/entities/MetaStateOperator.ts b/src/entities/MetaStateOperator.ts index f23c1c7f..5f67618d 100644 --- a/src/entities/MetaStateOperator.ts +++ b/src/entities/MetaStateOperator.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { MetaState } from "./MetaState"; diff --git a/src/entities/OrgChild1.ts b/src/entities/OrgChild1.ts index 4af47cb2..52adaff7 100644 --- a/src/entities/OrgChild1.ts +++ b/src/entities/OrgChild1.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany, PrimaryGeneratedColumn } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; import { EntityBase } from "./base/Base"; import { OrgRoot } from "./OrgRoot"; import { OrgChild2 } from "./OrgChild2"; diff --git a/src/entities/OrgChild2.ts b/src/entities/OrgChild2.ts index 91822992..842423c8 100644 --- a/src/entities/OrgChild2.ts +++ b/src/entities/OrgChild2.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; import { EntityBase } from "./base/Base"; import { OrgRoot } from "./OrgRoot"; import { OrgChild1 } from "./OrgChild1"; diff --git a/src/entities/OrgChild4.ts b/src/entities/OrgChild4.ts index 23a34bde..e8cb2170 100644 --- a/src/entities/OrgChild4.ts +++ b/src/entities/OrgChild4.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; import { EntityBase } from "./base/Base"; import { OrgRoot } from "./OrgRoot"; import { OrgChild1 } from "./OrgChild1"; diff --git a/src/entities/OrgRevision.ts b/src/entities/OrgRevision.ts index 66ef05da..b0a290f5 100644 --- a/src/entities/OrgRevision.ts +++ b/src/entities/OrgRevision.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm"; +import { Entity, Column, OneToMany } from "typeorm"; import { EntityBase } from "./base/Base"; import { OrgRoot } from "./OrgRoot"; import { PosMaster } from "./PosMaster"; diff --git a/src/entities/OrgRoot.ts b/src/entities/OrgRoot.ts index 0beabb2c..47e51706 100644 --- a/src/entities/OrgRoot.ts +++ b/src/entities/OrgRoot.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany, ManyToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; import { EntityBase } from "./base/Base"; import { OrgChild1 } from "./OrgChild1"; import { OrgRevision } from "./OrgRevision"; @@ -6,7 +6,6 @@ import { OrgChild2 } from "./OrgChild2"; import { OrgChild3 } from "./OrgChild3"; import { OrgChild4 } from "./OrgChild4"; import { PosMaster } from "./PosMaster"; -import { Profile } from "./Profile"; import { PermissionOrg } from "./PermissionOrg"; enum OrgRootRank { diff --git a/src/entities/PosDict.ts b/src/entities/PosDict.ts index f88b7e3b..a03fcbda 100644 --- a/src/entities/PosDict.ts +++ b/src/entities/PosDict.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { PosExecutive } from "./PosExecutive"; import { PosType } from "./PosType"; diff --git a/src/entities/PosExecutive.ts b/src/entities/PosExecutive.ts index 696fbddf..20b8a549 100644 --- a/src/entities/PosExecutive.ts +++ b/src/entities/PosExecutive.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm"; +import { Entity, Column, OneToMany } from "typeorm"; import { EntityBase } from "./base/Base"; import { Position } from "./Position"; import { PosDict } from "./PosDict"; diff --git a/src/entities/Position.ts b/src/entities/Position.ts index 8fd16b50..df2812aa 100644 --- a/src/entities/Position.ts +++ b/src/entities/Position.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { PosMaster } from "./PosMaster"; import { PosLevel } from "./PosLevel"; diff --git a/src/entities/Profile.ts b/src/entities/Profile.ts index 6b1cdec3..9038291e 100644 --- a/src/entities/Profile.ts +++ b/src/entities/Profile.ts @@ -1,4 +1,4 @@ -import { Entity, Column, OneToMany, JoinColumn, ManyToOne, ManyToMany } from "typeorm"; +import { Entity, Column, OneToMany, JoinColumn, ManyToOne } from "typeorm"; import { EntityBase } from "./base/Base"; import { PosMaster } from "./PosMaster"; import { PosLevel } from "./PosLevel"; diff --git a/src/entities/ProfileAbilityHistory.ts b/src/entities/ProfileAbilityHistory.ts index 17f05d2e..f3b4d7ab 100644 --- a/src/entities/ProfileAbilityHistory.ts +++ b/src/entities/ProfileAbilityHistory.ts @@ -1,6 +1,5 @@ import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileAbility } from "./ProfileAbility"; @Entity("profileAbilityHistory") diff --git a/src/entities/ProfileAssessmentHistory.ts b/src/entities/ProfileAssessmentHistory.ts index 46c5d533..573a3946 100644 --- a/src/entities/ProfileAssessmentHistory.ts +++ b/src/entities/ProfileAssessmentHistory.ts @@ -1,6 +1,5 @@ import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileAssessment } from "./ProfileAssessment"; @Entity("profileAssessmentHistory") diff --git a/src/entities/ProfileCertificateHistory.ts b/src/entities/ProfileCertificateHistory.ts index eee63916..8b2dad8d 100644 --- a/src/entities/ProfileCertificateHistory.ts +++ b/src/entities/ProfileCertificateHistory.ts @@ -1,6 +1,5 @@ -import { Entity, Column, OneToMany, ManyToOne, JoinColumn } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileCertificate } from "./ProfileCertificate"; @Entity("profileCertificateHistory") diff --git a/src/entities/ProfileChangeName.ts b/src/entities/ProfileChangeName.ts index 0da7a53c..25a7cc84 100644 --- a/src/entities/ProfileChangeName.ts +++ b/src/entities/ProfileChangeName.ts @@ -1,6 +1,5 @@ import { Entity, Column, OneToMany, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileChangeNameHistory } from "./ProfileChangeNameHistory"; import { ProfileEmployee } from "./ProfileEmployee"; // import { ProfileChangeNameHistory } from "./ProfileChangeNameHistory"; diff --git a/src/entities/ProfileChangeNameHistory.ts b/src/entities/ProfileChangeNameHistory.ts index d9f1489f..619344dd 100644 --- a/src/entities/ProfileChangeNameHistory.ts +++ b/src/entities/ProfileChangeNameHistory.ts @@ -1,6 +1,5 @@ -import { Entity, Column, OneToMany, ManyToOne, JoinColumn } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileChangeName } from "./ProfileChangeName"; @Entity("profileChangeNameHistory") diff --git a/src/entities/ProfileChildrenHistory.ts b/src/entities/ProfileChildrenHistory.ts index 2ce86751..39e34b74 100644 --- a/src/entities/ProfileChildrenHistory.ts +++ b/src/entities/ProfileChildrenHistory.ts @@ -1,7 +1,5 @@ -import { Column, Entity, ManyToOne, OneToMany, JoinColumn } from "typeorm"; +import { Column, Entity, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; -import { ProfileEmployee } from "./ProfileEmployee"; import { ProfileChildren } from "./ProfileChildren"; @Entity("profileChildrenHistory") diff --git a/src/entities/ProfileDisciplineHistory.ts b/src/entities/ProfileDisciplineHistory.ts index afafed17..33769257 100644 --- a/src/entities/ProfileDisciplineHistory.ts +++ b/src/entities/ProfileDisciplineHistory.ts @@ -1,6 +1,5 @@ import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileDiscipline } from "./ProfileDiscipline"; @Entity("profileDisciplineHistory") diff --git a/src/entities/ProfileDutyHistory.ts b/src/entities/ProfileDutyHistory.ts index af470777..31b1a01e 100644 --- a/src/entities/ProfileDutyHistory.ts +++ b/src/entities/ProfileDutyHistory.ts @@ -1,6 +1,5 @@ import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileDuty } from "./ProfileDuty"; @Entity("profileDutyHistory") diff --git a/src/entities/ProfileEdit.ts b/src/entities/ProfileEdit.ts index f15f4842..75c07e55 100644 --- a/src/entities/ProfileEdit.ts +++ b/src/entities/ProfileEdit.ts @@ -1,4 +1,4 @@ -import { Entity, Column, OneToMany, ManyToOne, JoinColumn } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { Profile } from "./Profile"; import { ProfileEmployee } from "./ProfileEmployee"; diff --git a/src/entities/ProfileEducationHistory.ts b/src/entities/ProfileEducationHistory.ts index f7e661da..f44e2836 100644 --- a/src/entities/ProfileEducationHistory.ts +++ b/src/entities/ProfileEducationHistory.ts @@ -1,6 +1,5 @@ import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileEducation } from "./ProfileEducation"; @Entity("profileEducationHistory") diff --git a/src/entities/ProfileEmployee.ts b/src/entities/ProfileEmployee.ts index 08abcadd..48809b88 100644 --- a/src/entities/ProfileEmployee.ts +++ b/src/entities/ProfileEmployee.ts @@ -24,7 +24,7 @@ import { ProfileFamilyFather } from "./ProfileFamilyFather"; import { ProfileFamilyMother } from "./ProfileFamilyMother"; import { ProfileFamilyCouple } from "./ProfileFamilyCouple"; import { ProfileChildren } from "./ProfileChildren"; -import { Profile, ProfileAddressHistory } from "./Profile"; +import { ProfileAddressHistory } from "./Profile"; import { Province } from "./Province"; import { District } from "./District"; import { SubDistrict } from "./SubDistrict"; diff --git a/src/entities/ProfileFamily.ts b/src/entities/ProfileFamily.ts index baee34ff..57cb84aa 100644 --- a/src/entities/ProfileFamily.ts +++ b/src/entities/ProfileFamily.ts @@ -1,4 +1,4 @@ -import { Column, Entity, ManyToOne, OneToMany, JoinColumn } from "typeorm"; +import { Column, Entity, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { Profile } from "./Profile"; import { ProfileEmployee } from "./ProfileEmployee"; diff --git a/src/entities/ProfileFamilyCoupleHistory.ts b/src/entities/ProfileFamilyCoupleHistory.ts index 13f682ff..340d6783 100644 --- a/src/entities/ProfileFamilyCoupleHistory.ts +++ b/src/entities/ProfileFamilyCoupleHistory.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { ProfileFamilyCouple } from "./ProfileFamilyCouple"; diff --git a/src/entities/ProfileFamilyFatherHistory.ts b/src/entities/ProfileFamilyFatherHistory.ts index 3c471b2c..614e0853 100644 --- a/src/entities/ProfileFamilyFatherHistory.ts +++ b/src/entities/ProfileFamilyFatherHistory.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { ProfileFamilyFather } from "./ProfileFamilyFather"; diff --git a/src/entities/ProfileFamilyMotherHistory.ts b/src/entities/ProfileFamilyMotherHistory.ts index f43b667d..457dc15a 100644 --- a/src/entities/ProfileFamilyMotherHistory.ts +++ b/src/entities/ProfileFamilyMotherHistory.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { ProfileFamilyMother } from "./ProfileFamilyMother"; diff --git a/src/entities/ProfileHonorHistory.ts b/src/entities/ProfileHonorHistory.ts index a4cea3dc..c2a45581 100644 --- a/src/entities/ProfileHonorHistory.ts +++ b/src/entities/ProfileHonorHistory.ts @@ -1,6 +1,5 @@ import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileHonor } from "./ProfileHonor"; @Entity("profileHonorHistory") diff --git a/src/entities/ProfileInsigniaHistory.ts b/src/entities/ProfileInsigniaHistory.ts index b5aa3d5e..8dfde589 100644 --- a/src/entities/ProfileInsigniaHistory.ts +++ b/src/entities/ProfileInsigniaHistory.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { ProfileInsignia } from "./ProfileInsignia"; import { Insignia } from "./Insignia"; diff --git a/src/entities/ProfileNopaidHistory.ts b/src/entities/ProfileNopaidHistory.ts index a995d4c6..28fa9afa 100644 --- a/src/entities/ProfileNopaidHistory.ts +++ b/src/entities/ProfileNopaidHistory.ts @@ -1,6 +1,5 @@ -import { Entity, Column, OneToMany, ManyToOne, JoinColumn } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileNopaid } from "./ProfileNopaid"; @Entity("profileNopaidHistory") diff --git a/src/entities/ProfileTrainingHistory.ts b/src/entities/ProfileTrainingHistory.ts index 4541725d..4ce0eada 100644 --- a/src/entities/ProfileTrainingHistory.ts +++ b/src/entities/ProfileTrainingHistory.ts @@ -1,6 +1,5 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileTraining } from "./ProfileTraining"; @Entity("profileTrainingHistory") diff --git a/src/entities/Relationship.ts b/src/entities/Relationship.ts index 6c018435..19b3629a 100644 --- a/src/entities/Relationship.ts +++ b/src/entities/Relationship.ts @@ -1,9 +1,6 @@ -import { Entity, Column, OneToMany } from "typeorm"; +import { Entity, Column } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; -import { ProfileEmployee } from "./ProfileEmployee"; - @Entity("relationship") export class Relationship extends EntityBase { @Column({ diff --git a/src/entities/Religion.ts b/src/entities/Religion.ts index a39b55fb..8898c3bc 100644 --- a/src/entities/Religion.ts +++ b/src/entities/Religion.ts @@ -1,7 +1,5 @@ -import { Entity, Column, OneToMany } from "typeorm"; +import { Entity, Column } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; -import { ProfileEmployee } from "./ProfileEmployee"; @Entity("religion") export class Religion extends EntityBase { diff --git a/src/entities/StateOperator.ts b/src/entities/StateOperator.ts index 4e0406d3..07ae241c 100644 --- a/src/entities/StateOperator.ts +++ b/src/entities/StateOperator.ts @@ -1,7 +1,6 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { State } from "./State"; -import { StateOperatorUser } from "./StateOperatorUser"; @Entity("stateOperator") export class StateOperator extends EntityBase {