fix bug
This commit is contained in:
parent
5da1345333
commit
2b7d44727c
1 changed files with 57 additions and 0 deletions
|
|
@ -1320,6 +1320,33 @@ export class EvaluationController {
|
|||
"salaries.refCommandNo",
|
||||
"salaries.refCommandDate",
|
||||
"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.topic",
|
||||
|
|
@ -1400,6 +1427,33 @@ export class EvaluationController {
|
|||
refCommandNo: salaries.refCommandNo,
|
||||
refCommandDate: salaries.refCommandDate,
|
||||
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) => ({
|
||||
name: training.name,
|
||||
|
|
@ -2478,6 +2532,7 @@ export class EvaluationController {
|
|||
const evaluation = await this.evaluationRepository.findOne({
|
||||
where: { id },
|
||||
select: [
|
||||
"id",
|
||||
"author",
|
||||
"subject",
|
||||
"commanderFullname",
|
||||
|
|
@ -2486,6 +2541,7 @@ export class EvaluationController {
|
|||
"commanderAbovePosition",
|
||||
],
|
||||
});
|
||||
|
||||
if (!evaluation) {
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found.");
|
||||
}
|
||||
|
|
@ -2513,6 +2569,7 @@ export class EvaluationController {
|
|||
const evaluation = await this.evaluationRepository.findOne({
|
||||
where: { id },
|
||||
select: [
|
||||
"id",
|
||||
"author",
|
||||
"subject",
|
||||
"commanderFullname",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue