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

Merge branch 'develop' of github.com:Frappet/bma-ehr-kpi into develop

Browse source
This commit is contained in:
Kittapath 2024-05-07 14:44:56 +07:00
commit bea28e0cc1
5 changed files with 355 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/entities/kpiPlan.ts
View file

@ -321,6 +321,10 @@ export class createKpiPlan {
// @Column()
// including: number | null;
@Column()
period: string | null;
@Column()
year: string | null;
@Column()
includingName: string | null;
@Column()
target: string | null;
@ -354,14 +358,18 @@ export class createKpiPlan {
strategyId: string | null;
@Column()
kpiPeriodId: string | null;
@Column()
documentInfoEvidence: string | null;
// @Column()
// documentInfoEvidence: string | null;
}
export class updateKpiPlan {
// @Column()
// including: number | null;
@Column()
period: string | null;
@Column()
year: string | null;
@Column()
includingName: string | null;
@Column()
target: string | null;
@ -395,6 +403,6 @@ export class updateKpiPlan {
strategyId: string | null;
@Column()
kpiPeriodId: string | null;
@Column()
documentInfoEvidence: string | null;
// @Column()
// documentInfoEvidence: string | null;
}

22
src/entities/kpiRole.ts
View file

@ -32,7 +32,7 @@ export class KpiRole extends EntityBase {
comment: "ลำดับ/รหัสตัวชี้วัด",
default: null,
})
including: string;
including: number;
@Column({
nullable: true,
@ -252,7 +252,11 @@ export class createKpiRole {
@Column()
position: string | null;
// @Column()
// including: string | null;
// including: number | null;
@Column()
period: string | null;
@Column()
year: string | null;
@Column()
includingName: string | null;
@Column()
@ -283,15 +287,19 @@ export class createKpiRole {
formula: string | null;
@Column()
kpiPeriodId: string | null;
@Column()
documentInfoEvidence: string | null;
// @Column()
// documentInfoEvidence: string | null;
}
export class updateKpiRole {
@Column()
position: string | null;
// @Column()
// including: string | null;
// including: number | null;
@Column()
period: string | null;
@Column()
year: string | null;
@Column()
includingName: string | null;
@Column()
@ -322,6 +330,6 @@ export class updateKpiRole {
formula: string | null;
@Column()
kpiPeriodId: string | null;
@Column()
documentInfoEvidence: string | null;
// @Column()
// documentInfoEvidence: string | null;
}