diff --git a/src/controllers/KpiRoleController.ts b/src/controllers/KpiRoleController.ts index afa3b52..8fe2922 100644 --- a/src/controllers/KpiRoleController.ts +++ b/src/controllers/KpiRoleController.ts @@ -419,7 +419,7 @@ export class kpiRoleController extends Controller { ? "kpiRole.year LIKE :year" : "1=1", { - year: requestBody.year, + year: `%${requestBody.year}%`, }, ) .andWhere( @@ -427,7 +427,7 @@ export class kpiRoleController extends Controller { ? "kpiRole.period LIKE :period" : "1=1", { - period: requestBody.period, + period: `%${requestBody.period}%`, }, ) .andWhere(requestBody.position != undefined ? "kpiRole.position LIKE :position" : "1=1", { diff --git a/src/controllers/KpiUserPlannedController.ts b/src/controllers/KpiUserPlannedController.ts index 6bbfc67..ff9f8fd 100644 --- a/src/controllers/KpiUserPlannedController.ts +++ b/src/controllers/KpiUserPlannedController.ts @@ -137,14 +137,14 @@ export class KpiUserPlannedController extends Controller { kpiUserPlanned.lastUpdateUserId = request.user.sub; kpiUserPlanned.lastUpdateFullName = request.user.name; - kpiUserPlanned.documentInfoEvidence = request.user.documentInfoEvidence; - kpiUserPlanned.startDate = request.user.startDate; - kpiUserPlanned.endDate = request.user.endDate; - kpiUserPlanned.achievement1 = request.user.achievement1; - kpiUserPlanned.achievement2 = request.user.achievement2; - kpiUserPlanned.achievement3 = request.user.achievement3; - kpiUserPlanned.achievement4 = request.user.achievement4; - kpiUserPlanned.achievement5 = request.user.achievement5; + // kpiUserPlanned.documentInfoEvidence = request.user.documentInfoEvidence; + // kpiUserPlanned.startDate = request.user.startDate; + // kpiUserPlanned.endDate = request.user.endDate; + // kpiUserPlanned.achievement1 = request.user.achievement1; + // kpiUserPlanned.achievement2 = request.user.achievement2; + // kpiUserPlanned.achievement3 = request.user.achievement3; + // kpiUserPlanned.achievement4 = request.user.achievement4; + // kpiUserPlanned.achievement5 = request.user.achievement5; this.kpiUserPlannedRepository.merge(kpiUserPlanned, requestBody); await this.kpiUserPlannedRepository.save(kpiUserPlanned); diff --git a/src/entities/kpiRole.ts b/src/entities/kpiRole.ts index cf9d7de..caa76a0 100644 --- a/src/entities/kpiRole.ts +++ b/src/entities/kpiRole.ts @@ -285,8 +285,8 @@ export class createKpiRole { meaning: string | null; @Column() formula: string | null; - @Column() - kpiPeriodId: string | null; + // @Column() + // kpiPeriodId: string | null; @Column() documentInfoEvidence: string | null; } @@ -328,8 +328,8 @@ export class updateKpiRole { meaning: string | null; @Column() formula: string | null; - @Column() - kpiPeriodId: string | null; + // @Column() + // kpiPeriodId: string | null; @Column() documentInfoEvidence: string | null; } diff --git a/src/entities/kpiUserPlanned.ts b/src/entities/kpiUserPlanned.ts index be57950..ecd9875 100644 --- a/src/entities/kpiUserPlanned.ts +++ b/src/entities/kpiUserPlanned.ts @@ -155,10 +155,10 @@ export class CreateKpiUserPlanned { kpiPlanId: string; @Column() documentInfoEvidence: string; - @Column() - startDate: Date; - @Column() - endDate: Date; + @Column({ nullable: true }) + startDate?: Date; + @Column({ nullable: true }) + endDate?: Date; @Column() achievement1: string; @Column() @@ -188,10 +188,10 @@ export class UpdateKpiUserPlanned { kpiPlanId: string; @Column() documentInfoEvidence: string; - @Column() - startDate: Date; - @Column() - endDate: Date; + @Column({ nullable: true }) + startDate?: Date; + @Column({ nullable: true }) + endDate?: Date; @Column() achievement1: string; @Column()