diff --git a/src/controllers/AssignController.ts b/src/controllers/AssignController.ts index 8d9f925..ec9f9c4 100644 --- a/src/controllers/AssignController.ts +++ b/src/controllers/AssignController.ts @@ -67,7 +67,7 @@ export class AssignController extends Controller { await new permission().PermissionUpdate(request, "SYS_PROBATION"); const person = await this.personalRepository.findOne({ where: { - personal_id: requestBody.personal_id, + personal_id: requestBody.personalId, }, }); @@ -78,14 +78,14 @@ export class AssignController extends Controller { const roundNo = await this.assignRepository.count({ where: { active: 1, - personal_id: requestBody.personal_id, + personal_id: requestBody.personalId, }, }); const data: any = { ...requestBody, round_no: roundNo + 1, - personal_id: requestBody.personal_id, + personal_id: requestBody.personalId, createdUserId: request.user.sub, createdFullName: request.user.name, updateUserId: request.user.sub, @@ -236,7 +236,7 @@ export class AssignController extends Controller { const person = await this.personalRepository.findOne({ where: { - personal_id: requestBody.personal_id, + personal_id: requestBody.personalId, }, }); diff --git a/src/entities/Assign.ts b/src/entities/Assign.ts index e7015df..602a022 100644 --- a/src/entities/Assign.ts +++ b/src/entities/Assign.ts @@ -1,20 +1,7 @@ -import { - CreateEvaluateCommander, - EvaluateCommander, -} from "./EvaluateCommander"; -import { - Entity, - Column, - OneToMany, - JoinColumn, - PrimaryGeneratedColumn, - ManyToOne, -} from "typeorm"; +import { CreateEvaluateCommander, EvaluateCommander } from "./EvaluateCommander"; +import { Entity, Column, OneToMany, JoinColumn, PrimaryGeneratedColumn, ManyToOne } from "typeorm"; import { EntityBase } from "./base/Base"; -import { - AssignCompetencyGroup, - CreateAssignCompetencyGroup, -} from "./AssignCompetencyGroup"; +import { AssignCompetencyGroup, CreateAssignCompetencyGroup } from "./AssignCompetencyGroup"; import { CreateSurvel, Survey } from "./Survey"; import { AssignCompetency, CreateAssignCompetency } from "./AssignCompetency"; import { AssignDirector, CreateAssignDirector } from "./AssignDirector"; @@ -23,10 +10,7 @@ import { AssignKnowledge, CreateAssignKnowledge } from "./AssignKnowledge"; import { AssignLaw, CreateAssignLaw } from "./AssignLaw"; import { AssignOutput, CreateAssignOutput } from "./AssignOutput"; import { AssignSkill, CreateAssignSkill } from "./AssignSkill"; -import { - CreateEvaluateAchievement, - EvaluateAchievement, -} from "./EvaluateAchievement"; +import { CreateEvaluateAchievement, EvaluateAchievement } from "./EvaluateAchievement"; import { CreateEvaluateAssessor, EvaluateAssessor } from "./EvaluateAssessor"; import { CreateEvaluateChairman, EvaluateChairman } from "./EvaluateChairman"; import { CreateEvaluateResult, EvaluateResult } from "./EvaluateResult"; @@ -102,22 +86,16 @@ export class Assign extends EntityBase { @OneToMany( () => AssignCompetencyGroup, - (competencyGroup: AssignCompetencyGroup) => competencyGroup.assign + (competencyGroup: AssignCompetencyGroup) => competencyGroup.assign, ) @JoinColumn({ name: "id" }) competencyGroups: AssignCompetencyGroup[]; - @OneToMany( - () => AssignCompetency, - (competency: AssignCompetency) => competency.assign - ) + @OneToMany(() => AssignCompetency, (competency: AssignCompetency) => competency.assign) @JoinColumn({ name: "id" }) competencys: AssignCompetency[]; - @OneToMany( - () => AssignDirector, - (director: AssignDirector) => director.assign - ) + @OneToMany(() => AssignDirector, (director: AssignDirector) => director.assign) @JoinColumn({ name: "id" }) directors: AssignDirector[]; @@ -125,10 +103,7 @@ export class Assign extends EntityBase { @JoinColumn({ name: "id" }) jobs: AssignJob[]; - @OneToMany( - () => AssignKnowledge, - (knowledge: AssignKnowledge) => knowledge.assign - ) + @OneToMany(() => AssignKnowledge, (knowledge: AssignKnowledge) => knowledge.assign) @JoinColumn({ name: "id" }) knowledges: AssignKnowledge[]; @@ -150,28 +125,28 @@ export class Assign extends EntityBase { @OneToMany( () => EvaluateAchievement, - (evaluateAchievement: EvaluateAchievement) => evaluateAchievement.assign + (evaluateAchievement: EvaluateAchievement) => evaluateAchievement.assign, ) @JoinColumn({ name: "id" }) evaluateAchievements: EvaluateAchievement; @OneToMany( () => EvaluateAssessor, - (evaluateAssessor: EvaluateAssessor) => evaluateAssessor.assign + (evaluateAssessor: EvaluateAssessor) => evaluateAssessor.assign, ) @JoinColumn({ name: "id" }) evaluateAssessors: EvaluateAssessor; @OneToMany( () => EvaluateChairman, - (evaluateChairman: EvaluateChairman) => evaluateChairman.assign + (evaluateChairman: EvaluateChairman) => evaluateChairman.assign, ) @JoinColumn({ name: "id" }) evaluateChairmans: EvaluateChairman; @OneToMany( () => EvaluateCommander, - (evaluateCommander: EvaluateCommander) => evaluateCommander.assign + (evaluateCommander: EvaluateCommander) => evaluateCommander.assign, ) @JoinColumn({ name: "id" }) evaluateCommanders: EvaluateCommander; @@ -193,7 +168,7 @@ export class CreateAssign { @Column() experimenter_dated?: Date; @Column() - personal_id?: string; + personalId?: string; fullname?: string; position?: string; monthSelect?: number;