fixing assign parameter

This commit is contained in:
Warunee Tamkoo 2024-09-06 09:48:59 +07:00
parent 0e54b8b880
commit 4b55b8cf20
2 changed files with 17 additions and 42 deletions

View file

@ -67,7 +67,7 @@ export class AssignController extends Controller {
await new permission().PermissionUpdate(request, "SYS_PROBATION"); await new permission().PermissionUpdate(request, "SYS_PROBATION");
const person = await this.personalRepository.findOne({ const person = await this.personalRepository.findOne({
where: { 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({ const roundNo = await this.assignRepository.count({
where: { where: {
active: 1, active: 1,
personal_id: requestBody.personal_id, personal_id: requestBody.personalId,
}, },
}); });
const data: any = { const data: any = {
...requestBody, ...requestBody,
round_no: roundNo + 1, round_no: roundNo + 1,
personal_id: requestBody.personal_id, personal_id: requestBody.personalId,
createdUserId: request.user.sub, createdUserId: request.user.sub,
createdFullName: request.user.name, createdFullName: request.user.name,
updateUserId: request.user.sub, updateUserId: request.user.sub,
@ -236,7 +236,7 @@ export class AssignController extends Controller {
const person = await this.personalRepository.findOne({ const person = await this.personalRepository.findOne({
where: { where: {
personal_id: requestBody.personal_id, personal_id: requestBody.personalId,
}, },
}); });

View file

@ -1,20 +1,7 @@
import { import { CreateEvaluateCommander, EvaluateCommander } from "./EvaluateCommander";
CreateEvaluateCommander, import { Entity, Column, OneToMany, JoinColumn, PrimaryGeneratedColumn, ManyToOne } from "typeorm";
EvaluateCommander,
} from "./EvaluateCommander";
import {
Entity,
Column,
OneToMany,
JoinColumn,
PrimaryGeneratedColumn,
ManyToOne,
} from "typeorm";
import { EntityBase } from "./base/Base"; import { EntityBase } from "./base/Base";
import { import { AssignCompetencyGroup, CreateAssignCompetencyGroup } from "./AssignCompetencyGroup";
AssignCompetencyGroup,
CreateAssignCompetencyGroup,
} from "./AssignCompetencyGroup";
import { CreateSurvel, Survey } from "./Survey"; import { CreateSurvel, Survey } from "./Survey";
import { AssignCompetency, CreateAssignCompetency } from "./AssignCompetency"; import { AssignCompetency, CreateAssignCompetency } from "./AssignCompetency";
import { AssignDirector, CreateAssignDirector } from "./AssignDirector"; import { AssignDirector, CreateAssignDirector } from "./AssignDirector";
@ -23,10 +10,7 @@ import { AssignKnowledge, CreateAssignKnowledge } from "./AssignKnowledge";
import { AssignLaw, CreateAssignLaw } from "./AssignLaw"; import { AssignLaw, CreateAssignLaw } from "./AssignLaw";
import { AssignOutput, CreateAssignOutput } from "./AssignOutput"; import { AssignOutput, CreateAssignOutput } from "./AssignOutput";
import { AssignSkill, CreateAssignSkill } from "./AssignSkill"; import { AssignSkill, CreateAssignSkill } from "./AssignSkill";
import { import { CreateEvaluateAchievement, EvaluateAchievement } from "./EvaluateAchievement";
CreateEvaluateAchievement,
EvaluateAchievement,
} from "./EvaluateAchievement";
import { CreateEvaluateAssessor, EvaluateAssessor } from "./EvaluateAssessor"; import { CreateEvaluateAssessor, EvaluateAssessor } from "./EvaluateAssessor";
import { CreateEvaluateChairman, EvaluateChairman } from "./EvaluateChairman"; import { CreateEvaluateChairman, EvaluateChairman } from "./EvaluateChairman";
import { CreateEvaluateResult, EvaluateResult } from "./EvaluateResult"; import { CreateEvaluateResult, EvaluateResult } from "./EvaluateResult";
@ -102,22 +86,16 @@ export class Assign extends EntityBase {
@OneToMany( @OneToMany(
() => AssignCompetencyGroup, () => AssignCompetencyGroup,
(competencyGroup: AssignCompetencyGroup) => competencyGroup.assign (competencyGroup: AssignCompetencyGroup) => competencyGroup.assign,
) )
@JoinColumn({ name: "id" }) @JoinColumn({ name: "id" })
competencyGroups: AssignCompetencyGroup[]; competencyGroups: AssignCompetencyGroup[];
@OneToMany( @OneToMany(() => AssignCompetency, (competency: AssignCompetency) => competency.assign)
() => AssignCompetency,
(competency: AssignCompetency) => competency.assign
)
@JoinColumn({ name: "id" }) @JoinColumn({ name: "id" })
competencys: AssignCompetency[]; competencys: AssignCompetency[];
@OneToMany( @OneToMany(() => AssignDirector, (director: AssignDirector) => director.assign)
() => AssignDirector,
(director: AssignDirector) => director.assign
)
@JoinColumn({ name: "id" }) @JoinColumn({ name: "id" })
directors: AssignDirector[]; directors: AssignDirector[];
@ -125,10 +103,7 @@ export class Assign extends EntityBase {
@JoinColumn({ name: "id" }) @JoinColumn({ name: "id" })
jobs: AssignJob[]; jobs: AssignJob[];
@OneToMany( @OneToMany(() => AssignKnowledge, (knowledge: AssignKnowledge) => knowledge.assign)
() => AssignKnowledge,
(knowledge: AssignKnowledge) => knowledge.assign
)
@JoinColumn({ name: "id" }) @JoinColumn({ name: "id" })
knowledges: AssignKnowledge[]; knowledges: AssignKnowledge[];
@ -150,28 +125,28 @@ export class Assign extends EntityBase {
@OneToMany( @OneToMany(
() => EvaluateAchievement, () => EvaluateAchievement,
(evaluateAchievement: EvaluateAchievement) => evaluateAchievement.assign (evaluateAchievement: EvaluateAchievement) => evaluateAchievement.assign,
) )
@JoinColumn({ name: "id" }) @JoinColumn({ name: "id" })
evaluateAchievements: EvaluateAchievement; evaluateAchievements: EvaluateAchievement;
@OneToMany( @OneToMany(
() => EvaluateAssessor, () => EvaluateAssessor,
(evaluateAssessor: EvaluateAssessor) => evaluateAssessor.assign (evaluateAssessor: EvaluateAssessor) => evaluateAssessor.assign,
) )
@JoinColumn({ name: "id" }) @JoinColumn({ name: "id" })
evaluateAssessors: EvaluateAssessor; evaluateAssessors: EvaluateAssessor;
@OneToMany( @OneToMany(
() => EvaluateChairman, () => EvaluateChairman,
(evaluateChairman: EvaluateChairman) => evaluateChairman.assign (evaluateChairman: EvaluateChairman) => evaluateChairman.assign,
) )
@JoinColumn({ name: "id" }) @JoinColumn({ name: "id" })
evaluateChairmans: EvaluateChairman; evaluateChairmans: EvaluateChairman;
@OneToMany( @OneToMany(
() => EvaluateCommander, () => EvaluateCommander,
(evaluateCommander: EvaluateCommander) => evaluateCommander.assign (evaluateCommander: EvaluateCommander) => evaluateCommander.assign,
) )
@JoinColumn({ name: "id" }) @JoinColumn({ name: "id" })
evaluateCommanders: EvaluateCommander; evaluateCommanders: EvaluateCommander;
@ -193,7 +168,7 @@ export class CreateAssign {
@Column() @Column()
experimenter_dated?: Date; experimenter_dated?: Date;
@Column() @Column()
personal_id?: string; personalId?: string;
fullname?: string; fullname?: string;
position?: string; position?: string;
monthSelect?: number; monthSelect?: number;