hrms-bangkok/hrms-api-kpi
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix bug

Browse source
This commit is contained in:
AdisakKanthawilang 2024-05-08 16:41:35 +07:00
parent 45b460a095
commit eeb70570c8
4 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/KpiRoleController.ts
View file

@ -419,7 +419,7 @@ export class kpiRoleController extends Controller {
? "kpiRole.year LIKE :year" ? "kpiRole.year LIKE :year"
: "1=1", : "1=1",
{ {
year: requestBody.year, year: `%${requestBody.year}%`,
}, },
) )
.andWhere( .andWhere(
@ -427,7 +427,7 @@ export class kpiRoleController extends Controller {
? "kpiRole.period LIKE :period" ? "kpiRole.period LIKE :period"
: "1=1", : "1=1",
{ {
period: requestBody.period, period: `%${requestBody.period}%`,
}, },
) )
.andWhere(requestBody.position != undefined ? "kpiRole.position LIKE :position" : "1=1", { .andWhere(requestBody.position != undefined ? "kpiRole.position LIKE :position" : "1=1", {

16
src/controllers/KpiUserPlannedController.ts
View file

@ -137,14 +137,14 @@ export class KpiUserPlannedController extends Controller {
kpiUserPlanned.lastUpdateUserId = request.user.sub; kpiUserPlanned.lastUpdateUserId = request.user.sub;
kpiUserPlanned.lastUpdateFullName = request.user.name; kpiUserPlanned.lastUpdateFullName = request.user.name;
kpiUserPlanned.documentInfoEvidence = request.user.documentInfoEvidence; // kpiUserPlanned.documentInfoEvidence = request.user.documentInfoEvidence;
kpiUserPlanned.startDate = request.user.startDate; // kpiUserPlanned.startDate = request.user.startDate;
kpiUserPlanned.endDate = request.user.endDate; // kpiUserPlanned.endDate = request.user.endDate;
kpiUserPlanned.achievement1 = request.user.achievement1; // kpiUserPlanned.achievement1 = request.user.achievement1;
kpiUserPlanned.achievement2 = request.user.achievement2; // kpiUserPlanned.achievement2 = request.user.achievement2;
kpiUserPlanned.achievement3 = request.user.achievement3; // kpiUserPlanned.achievement3 = request.user.achievement3;
kpiUserPlanned.achievement4 = request.user.achievement4; // kpiUserPlanned.achievement4 = request.user.achievement4;
kpiUserPlanned.achievement5 = request.user.achievement5; // kpiUserPlanned.achievement5 = request.user.achievement5;
this.kpiUserPlannedRepository.merge(kpiUserPlanned, requestBody); this.kpiUserPlannedRepository.merge(kpiUserPlanned, requestBody);
await this.kpiUserPlannedRepository.save(kpiUserPlanned); await this.kpiUserPlannedRepository.save(kpiUserPlanned);

8
src/entities/kpiRole.ts
View file

@ -285,8 +285,8 @@ export class createKpiRole {
meaning: string | null; meaning: string | null;
@Column() @Column()
formula: string | null; formula: string | null;
@Column() // @Column()
kpiPeriodId: string | null; // kpiPeriodId: string | null;
@Column() @Column()
documentInfoEvidence: string | null; documentInfoEvidence: string | null;
} }
@ -328,8 +328,8 @@ export class updateKpiRole {
meaning: string | null; meaning: string | null;
@Column() @Column()
formula: string | null; formula: string | null;
@Column() // @Column()
kpiPeriodId: string | null; // kpiPeriodId: string | null;
@Column() @Column()
documentInfoEvidence: string | null; documentInfoEvidence: string | null;
} }

16
src/entities/kpiUserPlanned.ts
View file

@ -155,10 +155,10 @@ export class CreateKpiUserPlanned {
kpiPlanId: string; kpiPlanId: string;
@Column() @Column()
documentInfoEvidence: string; documentInfoEvidence: string;
@Column() @Column({ nullable: true })
startDate: Date; startDate?: Date;
@Column() @Column({ nullable: true })
endDate: Date; endDate?: Date;
@Column() @Column()
achievement1: string; achievement1: string;
@Column() @Column()
@ -188,10 +188,10 @@ export class UpdateKpiUserPlanned {
kpiPlanId: string; kpiPlanId: string;
@Column() @Column()
documentInfoEvidence: string; documentInfoEvidence: string;
@Column() @Column({ nullable: true })
startDate: Date; startDate?: Date;
@Column() @Column({ nullable: true })
endDate: Date; endDate?: Date;
@Column() @Column()
achievement1: string; achievement1: string;
@Column() @Column()