hrms-bangkok/hrms-api-eva
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 2025-04-08 17:45:47 +07:00
parent 5da1345333
commit 2b7d44727c
1 changed files with 57 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/controllers/EvaluationController.ts
View file

@ -1320,6 +1320,33 @@ export class EvaluationController {
"salaries.refCommandNo", "salaries.refCommandNo",
"salaries.refCommandDate", "salaries.refCommandDate",
"salaries.salaryStatus", "salaries.salaryStatus",
"salaries.profileId",
"salaries.commandCode",
"salaries.commandNo",
"salaries.commandYear",
"salaries.commandDateAffect",
"salaries.commandDateSign",
"salaries.posNoAbb",
"salaries.positionName",
"salaries.positionType",
"salaries.positionLevel",
"salaries.positionLine",
"salaries.positionPathSide",
"salaries.positionExecutive",
"salaries.amountSpecial",
"salaries.orgRoot",
"salaries.orgChild1",
"salaries.orgChild2",
"salaries.orgChild3",
"salaries.orgChild4",
"salaries.remark",
"salaries.commandId",
"salaries.isGovernment",
"salaries.positionCee",
"salaries.commandName",
"salaries.posNumCodeSit",
"salaries.posNumCodeSitAbb",
"salaries.isEntry",
"training.name", "training.name",
"training.topic", "training.topic",
@ -1400,6 +1427,33 @@ export class EvaluationController {
refCommandNo: salaries.refCommandNo, refCommandNo: salaries.refCommandNo,
refCommandDate: salaries.refCommandDate, refCommandDate: salaries.refCommandDate,
salaryStatus: salaries.salaryStatus, salaryStatus: salaries.salaryStatus,
profileId: salaries.profileId,
commandCode: salaries.commandCode,
commandNo: salaries.commandNo,
commandYear: salaries.commandYear,
commandDateAffect: salaries.commandDateAffect,
commandDateSign: salaries.commandDateSign,
posNoAbb: salaries.posNoAbb,
positionName: salaries.positionName,
positionType: salaries.positionType,
positionLevel: salaries.positionLevel,
positionLine: salaries.positionLine,
positionPathSide: salaries.positionPathSide,
positionExecutive: salaries.positionExecutive,
amountSpecial: salaries.amountSpecial,
orgRoot: salaries.orgRoot,
orgChild1: salaries.orgChild1,
orgChild2: salaries.orgChild2,
orgChild3: salaries.orgChild3,
orgChild4: salaries.orgChild4,
remark: salaries.remark,
commandId: salaries.commandId,
isGovernment: salaries.isGovernment,
positionCee: salaries.positionCee,
commandName: salaries.commandName,
posNumCodeSit: salaries.posNumCodeSit,
posNumCodeSitAbb: salaries.posNumCodeSitAbb,
isEntry: salaries.isEntry,
})), })),
trainings: evaluation.training.map((training) => ({ trainings: evaluation.training.map((training) => ({
name: training.name, name: training.name,
@ -2478,6 +2532,7 @@ export class EvaluationController {
const evaluation = await this.evaluationRepository.findOne({ const evaluation = await this.evaluationRepository.findOne({
where: { id }, where: { id },
select: [ select: [
"id",
"author", "author",
"subject", "subject",
"commanderFullname", "commanderFullname",
@ -2486,6 +2541,7 @@ export class EvaluationController {
"commanderAbovePosition", "commanderAbovePosition",
], ],
}); });
if (!evaluation) { if (!evaluation) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found."); throw new HttpError(HttpStatusCode.NOT_FOUND, "not found.");
} }
@ -2513,6 +2569,7 @@ export class EvaluationController {
const evaluation = await this.evaluationRepository.findOne({ const evaluation = await this.evaluationRepository.findOne({
where: { id }, where: { id },
select: [ select: [
"id",
"author", "author",
"subject", "subject",
"commanderFullname", "commanderFullname",