no message
This commit is contained in:
parent
4f54040982
commit
1c42a242c0
4 changed files with 4 additions and 29 deletions
|
|
@ -84,7 +84,7 @@ export class kpiPlanController extends Controller {
|
||||||
kpiPlan.strategyChild5Id = requestBody.strategy <= 4 ? null : x.strategyChild5Id;
|
kpiPlan.strategyChild5Id = requestBody.strategy <= 4 ? null : x.strategyChild5Id;
|
||||||
})
|
})
|
||||||
.catch((x) => {});
|
.catch((x) => {});
|
||||||
kpiPlan.round = requestBody.round.trim().toUpperCase();
|
|
||||||
kpiPlan.createdUserId = request.user.sub;
|
kpiPlan.createdUserId = request.user.sub;
|
||||||
kpiPlan.createdFullName = request.user.name;
|
kpiPlan.createdFullName = request.user.name;
|
||||||
kpiPlan.lastUpdateUserId = request.user.sub;
|
kpiPlan.lastUpdateUserId = request.user.sub;
|
||||||
|
|
@ -112,7 +112,6 @@ export class kpiPlanController extends Controller {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลตัวชี้วัดตามแผนฯนี้");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลตัวชี้วัดตามแผนฯนี้");
|
||||||
}
|
}
|
||||||
|
|
||||||
kpiPlan.round = requestBody.round.trim().toUpperCase();
|
|
||||||
Object.assign(kpiPlan, requestBody);
|
Object.assign(kpiPlan, requestBody);
|
||||||
await new CallAPI()
|
await new CallAPI()
|
||||||
.PostData(request, "org/find/all", {
|
.PostData(request, "org/find/all", {
|
||||||
|
|
@ -214,7 +213,7 @@ export class kpiPlanController extends Controller {
|
||||||
const formattedData = {
|
const formattedData = {
|
||||||
id: kpiPlan.id,
|
id: kpiPlan.id,
|
||||||
year: kpiPlan.year,
|
year: kpiPlan.year,
|
||||||
round: kpiPlan.round,
|
// round: kpiPlan.round,
|
||||||
including: kpiPlan.including,
|
including: kpiPlan.including,
|
||||||
includingName: kpiPlan.includingName,
|
includingName: kpiPlan.includingName,
|
||||||
target: kpiPlan.target,
|
target: kpiPlan.target,
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,6 @@ export class kpiRoleController extends Controller {
|
||||||
kpiRole.child4ShortName = requestBody.node <= 3 ? null : x.child4ShortName;
|
kpiRole.child4ShortName = requestBody.node <= 3 ? null : x.child4ShortName;
|
||||||
})
|
})
|
||||||
.catch((x) => {});
|
.catch((x) => {});
|
||||||
kpiRole.round = requestBody.round.trim().toUpperCase();
|
|
||||||
kpiRole.createdUserId = request.user.sub;
|
kpiRole.createdUserId = request.user.sub;
|
||||||
kpiRole.createdFullName = request.user.name;
|
kpiRole.createdFullName = request.user.name;
|
||||||
kpiRole.lastUpdateUserId = request.user.sub;
|
kpiRole.lastUpdateUserId = request.user.sub;
|
||||||
|
|
@ -94,7 +93,6 @@ export class kpiRoleController extends Controller {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลตัวชี้วัดตามตำแหน่งนี้");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลตัวชี้วัดตามตำแหน่งนี้");
|
||||||
}
|
}
|
||||||
|
|
||||||
kpiRole.round = requestBody.round.trim().toUpperCase();
|
|
||||||
Object.assign(kpiRole, requestBody);
|
Object.assign(kpiRole, requestBody);
|
||||||
await new CallAPI()
|
await new CallAPI()
|
||||||
.PostData(request, "org/find/all", {
|
.PostData(request, "org/find/all", {
|
||||||
|
|
@ -160,7 +158,7 @@ export class kpiRoleController extends Controller {
|
||||||
const formattedData = {
|
const formattedData = {
|
||||||
id: kpiRole.id,
|
id: kpiRole.id,
|
||||||
year: kpiRole.year,
|
year: kpiRole.year,
|
||||||
round: kpiRole.round,
|
// round: kpiRole.round,
|
||||||
including: kpiRole.including,
|
including: kpiRole.including,
|
||||||
includingName: kpiRole.includingName,
|
includingName: kpiRole.includingName,
|
||||||
target: kpiRole.target,
|
target: kpiRole.target,
|
||||||
|
|
@ -176,7 +174,7 @@ export class kpiRoleController extends Controller {
|
||||||
node: node,
|
node: node,
|
||||||
nodeId: nodeId,
|
nodeId: nodeId,
|
||||||
orgRevisionId: kpiRole.orgRevisionId,
|
orgRevisionId: kpiRole.orgRevisionId,
|
||||||
position: kpiRole.position
|
position: kpiRole.position,
|
||||||
};
|
};
|
||||||
return new HttpSuccess(formattedData);
|
return new HttpSuccess(formattedData);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,13 +11,6 @@ export class KpiPlan extends EntityBase {
|
||||||
})
|
})
|
||||||
year: number;
|
year: number;
|
||||||
|
|
||||||
@Column({
|
|
||||||
nullable: true,
|
|
||||||
comment: "รอบการประเมิน",
|
|
||||||
default: null,
|
|
||||||
})
|
|
||||||
round: string;
|
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
nullable: true,
|
nullable: true,
|
||||||
comment: "รหัสตัวชี้วัด",
|
comment: "รหัสตัวชี้วัด",
|
||||||
|
|
@ -305,8 +298,6 @@ export class createKpiPlan {
|
||||||
@Column()
|
@Column()
|
||||||
year: number | null;
|
year: number | null;
|
||||||
@Column()
|
@Column()
|
||||||
round: string;
|
|
||||||
@Column()
|
|
||||||
including: string | null;
|
including: string | null;
|
||||||
@Column()
|
@Column()
|
||||||
includingName: string | null;
|
includingName: string | null;
|
||||||
|
|
@ -348,8 +339,6 @@ export class updateKpiPlan {
|
||||||
@Column()
|
@Column()
|
||||||
year: number | null;
|
year: number | null;
|
||||||
@Column()
|
@Column()
|
||||||
round: string;
|
|
||||||
@Column()
|
|
||||||
including: string | null;
|
including: string | null;
|
||||||
@Column()
|
@Column()
|
||||||
includingName: string | null;
|
includingName: string | null;
|
||||||
|
|
|
||||||
|
|
@ -18,13 +18,6 @@ export class KpiRole extends EntityBase {
|
||||||
})
|
})
|
||||||
year: number;
|
year: number;
|
||||||
|
|
||||||
@Column({
|
|
||||||
nullable: true,
|
|
||||||
comment: "รอบการประเมิน",
|
|
||||||
default: null,
|
|
||||||
})
|
|
||||||
round: string;
|
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
nullable: true,
|
nullable: true,
|
||||||
comment: "รหัสตัวชี้วัด",
|
comment: "รหัสตัวชี้วัด",
|
||||||
|
|
@ -239,8 +232,6 @@ export class createKpiRole {
|
||||||
@Column()
|
@Column()
|
||||||
year: number | null;
|
year: number | null;
|
||||||
@Column()
|
@Column()
|
||||||
round: string;
|
|
||||||
@Column()
|
|
||||||
including: string | null;
|
including: string | null;
|
||||||
@Column()
|
@Column()
|
||||||
includingName: string | null;
|
includingName: string | null;
|
||||||
|
|
@ -280,8 +271,6 @@ export class updateKpiRole {
|
||||||
@Column()
|
@Column()
|
||||||
year: number | null;
|
year: number | null;
|
||||||
@Column()
|
@Column()
|
||||||
round: string;
|
|
||||||
@Column()
|
|
||||||
including: string | null;
|
including: string | null;
|
||||||
@Column()
|
@Column()
|
||||||
includingName: string | null;
|
includingName: string | null;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue