fixing path
This commit is contained in:
parent
400b9c0b28
commit
ba612f1b2b
12 changed files with 325 additions and 723 deletions
|
|
@ -22,34 +22,25 @@ import HttpError from "../interfaces/http-error";
|
|||
import { Assign } from "../entities/Assign";
|
||||
import { Personal } from "../entities/Personal";
|
||||
import { AssignOutput } from "../entities/AssignOutput";
|
||||
import {
|
||||
CreateEvaluateAssessor,
|
||||
EvaluateAssessor,
|
||||
} from "../entities/EvaluateAssessor";
|
||||
import {
|
||||
CreateEvaluateAchievement,
|
||||
EvaluateAchievement,
|
||||
} from "../entities/EvaluateAchievement";
|
||||
import { CreateEvaluateAssessor, EvaluateAssessor } from "../entities/EvaluateAssessor";
|
||||
import { CreateEvaluateAchievement, EvaluateAchievement } from "../entities/EvaluateAchievement";
|
||||
import CallAPI from "../interfaces/call-api";
|
||||
|
||||
@Route("api/v1/evaluate-record")
|
||||
@Route("api/v1/probation/evaluate-record")
|
||||
@Tags("แบบบันทึกผล")
|
||||
@Security("bearerAuth")
|
||||
@Response(
|
||||
HttpStatusCode.INTERNAL_SERVER_ERROR,
|
||||
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง"
|
||||
"เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง",
|
||||
)
|
||||
@SuccessResponse(HttpStatusCode.OK, "สำเร็จ")
|
||||
export class EvaluateRecordController extends Controller {
|
||||
private assignDirectorRepository =
|
||||
AppDataSource.getRepository(AssignDirector);
|
||||
private assignDirectorRepository = AppDataSource.getRepository(AssignDirector);
|
||||
private assignRepository = AppDataSource.getRepository(Assign);
|
||||
private personalRepository = AppDataSource.getRepository(Personal);
|
||||
private assignOutputRepository = AppDataSource.getRepository(AssignOutput);
|
||||
private evaluateAssessorRepository =
|
||||
AppDataSource.getRepository(EvaluateAssessor);
|
||||
private evaluateAchievementRepository =
|
||||
AppDataSource.getRepository(EvaluateAchievement);
|
||||
private evaluateAssessorRepository = AppDataSource.getRepository(EvaluateAssessor);
|
||||
private evaluateAchievementRepository = AppDataSource.getRepository(EvaluateAchievement);
|
||||
|
||||
/**
|
||||
* API ดึงข้อมูลตอนกดสร้างแบบบันทึกผล
|
||||
|
|
@ -58,19 +49,9 @@ export class EvaluateRecordController extends Controller {
|
|||
*
|
||||
*/
|
||||
@Get("create")
|
||||
async GetCreate(
|
||||
@Query() assign_id: string,
|
||||
@Request() request: RequestWithUser
|
||||
) {
|
||||
async GetCreate(@Query() assign_id: string) {
|
||||
const directorData = await this.assignDirectorRepository.findOne({
|
||||
select: [
|
||||
"personal_id",
|
||||
"dated",
|
||||
"fullname",
|
||||
"position",
|
||||
"posType",
|
||||
"posLevel",
|
||||
],
|
||||
select: ["personal_id", "dated", "fullname", "position", "posType", "posLevel"],
|
||||
where: {
|
||||
assign_id,
|
||||
role: "mentor",
|
||||
|
|
@ -96,10 +77,7 @@ export class EvaluateRecordController extends Controller {
|
|||
});
|
||||
|
||||
if (!assign) {
|
||||
return new HttpError(
|
||||
HttpStatusCode.NOT_FOUND,
|
||||
"ไม่พบข้อมูลแบบมอบหมายงาน"
|
||||
);
|
||||
return new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
|
||||
}
|
||||
|
||||
const profileData = await this.personalRepository.findOne({
|
||||
|
|
@ -122,11 +100,7 @@ export class EvaluateRecordController extends Controller {
|
|||
|
||||
const profile = await {
|
||||
id: profileData.personal_id,
|
||||
name:
|
||||
profileData.prefixName +
|
||||
profileData.firstName +
|
||||
" " +
|
||||
profileData.lastName,
|
||||
name: profileData.prefixName + profileData.firstName + " " + profileData.lastName,
|
||||
positionName: profileData.positionName,
|
||||
positionLevelName: profileData.positionLevelName,
|
||||
Oc: profileData.organization,
|
||||
|
|
@ -153,22 +127,12 @@ export class EvaluateRecordController extends Controller {
|
|||
: findEndDate(evaluate_amount * 2, assign.date_start));
|
||||
|
||||
var commanderData = await this.assignDirectorRepository.findOne({
|
||||
select: [
|
||||
"personal_id",
|
||||
"dated",
|
||||
"fullname",
|
||||
"position",
|
||||
"posType",
|
||||
"posLevel",
|
||||
],
|
||||
select: ["personal_id", "dated", "fullname", "position", "posType", "posLevel"],
|
||||
where: { personal_id: director_id },
|
||||
});
|
||||
|
||||
if (!commanderData) {
|
||||
return new HttpError(
|
||||
HttpStatusCode.NOT_FOUND,
|
||||
"ไม่พบข้อมูลผู้บังคับบัญชา"
|
||||
);
|
||||
return new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้บังคับบัญชา");
|
||||
}
|
||||
|
||||
const commander = await {
|
||||
|
|
@ -225,12 +189,7 @@ export class EvaluateRecordController extends Controller {
|
|||
}
|
||||
|
||||
const achievementData = await this.evaluateAchievementRepository.find({
|
||||
select: [
|
||||
"output_desc",
|
||||
"evaluate_expect_level",
|
||||
"output_desc",
|
||||
"evaluate_output_level",
|
||||
],
|
||||
select: ["output_desc", "evaluate_expect_level", "output_desc", "evaluate_output_level"],
|
||||
where: {
|
||||
evaluate_id: evaluate.id,
|
||||
},
|
||||
|
|
@ -304,20 +263,18 @@ export class EvaluateRecordController extends Controller {
|
|||
|
||||
await Promise.all(
|
||||
evaluate.map(async (element: any, index: number) => {
|
||||
const achievementData = await this.evaluateAchievementRepository.find(
|
||||
{
|
||||
select: [
|
||||
"output_desc",
|
||||
"evaluate_expect_level",
|
||||
"output_desc",
|
||||
"evaluate_output_level",
|
||||
],
|
||||
where: {
|
||||
evaluate_id: element.id,
|
||||
},
|
||||
order: { output_id: "ASC" },
|
||||
}
|
||||
);
|
||||
const achievementData = await this.evaluateAchievementRepository.find({
|
||||
select: [
|
||||
"output_desc",
|
||||
"evaluate_expect_level",
|
||||
"output_desc",
|
||||
"evaluate_output_level",
|
||||
],
|
||||
where: {
|
||||
evaluate_id: element.id,
|
||||
},
|
||||
order: { output_id: "ASC" },
|
||||
});
|
||||
|
||||
const achievements = await achievementData.map((achievement) => {
|
||||
return {
|
||||
|
|
@ -368,7 +325,7 @@ export class EvaluateRecordController extends Controller {
|
|||
updatedAt: element.updatedAt,
|
||||
achievements: achievements,
|
||||
};
|
||||
})
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -379,10 +336,7 @@ export class EvaluateRecordController extends Controller {
|
|||
});
|
||||
|
||||
if (!assign) {
|
||||
return new HttpError(
|
||||
HttpStatusCode.NOT_FOUND,
|
||||
"ไม่พบข้อมูลแบบมอบหมายงาน"
|
||||
);
|
||||
return new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
|
||||
}
|
||||
|
||||
const experimenteeData = await this.personalRepository.find({
|
||||
|
|
@ -405,14 +359,7 @@ export class EvaluateRecordController extends Controller {
|
|||
}));
|
||||
|
||||
const directorData = await this.assignDirectorRepository.find({
|
||||
select: [
|
||||
"personal_id",
|
||||
"dated",
|
||||
"fullname",
|
||||
"position",
|
||||
"posType",
|
||||
"posLevel",
|
||||
],
|
||||
select: ["personal_id", "dated", "fullname", "position", "posType", "posLevel"],
|
||||
where: { personal_id: director_id },
|
||||
});
|
||||
|
||||
|
|
@ -440,7 +387,7 @@ export class EvaluateRecordController extends Controller {
|
|||
async PostData(
|
||||
@Query() assign_id: string,
|
||||
@Body() requestBody: CreateEvaluateAssessor,
|
||||
@Request() request: RequestWithUser
|
||||
@Request() request: RequestWithUser,
|
||||
) {
|
||||
const director = await this.assignDirectorRepository.findOne({
|
||||
select: ["personal_id"],
|
||||
|
|
@ -460,10 +407,7 @@ export class EvaluateRecordController extends Controller {
|
|||
where: { id: assign_id },
|
||||
});
|
||||
if (!assign) {
|
||||
return new HttpError(
|
||||
HttpStatusCode.NOT_FOUND,
|
||||
"ไม่พบข้อมูลแบบมอบหมายงาน"
|
||||
);
|
||||
return new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
|
||||
}
|
||||
|
||||
const postData: any = await {
|
||||
|
|
@ -482,9 +426,7 @@ export class EvaluateRecordController extends Controller {
|
|||
: 0,
|
||||
behavior_other_desc: requestBody.behavio_orther.text,
|
||||
behavior_other_level:
|
||||
requestBody.behavio_orther.text != ""
|
||||
? Number(requestBody.behavio_orther.level)
|
||||
: 0,
|
||||
requestBody.behavio_orther.text != "" ? Number(requestBody.behavio_orther.level) : 0,
|
||||
behavior_strength_desc: requestBody.behavior_strength_desc,
|
||||
behavior_improve_desc: requestBody.behavior_improve_desc,
|
||||
orientation: requestBody.orientation,
|
||||
|
|
@ -497,10 +439,9 @@ export class EvaluateRecordController extends Controller {
|
|||
updateFullName: request.user.name,
|
||||
};
|
||||
|
||||
const evaluateAssessor = await this.evaluateAssessorRepository.save(
|
||||
postData,
|
||||
{ data: request }
|
||||
);
|
||||
const evaluateAssessor = await this.evaluateAssessorRepository.save(postData, {
|
||||
data: request,
|
||||
});
|
||||
|
||||
if (evaluateAssessor) {
|
||||
await Promise.all(
|
||||
|
|
@ -513,9 +454,7 @@ export class EvaluateRecordController extends Controller {
|
|||
assessor_id: director_id,
|
||||
evaluate_expect_level: Number(expenct.level),
|
||||
output_desc: requestBody.evaluate_ouptut[index].text,
|
||||
evaluate_output_level: Number(
|
||||
requestBody.evaluate_ouptut[index].level
|
||||
),
|
||||
evaluate_output_level: Number(requestBody.evaluate_ouptut[index].level),
|
||||
createdUserId: request.user.sub,
|
||||
createdFullName: request.user.name,
|
||||
updateUserId: request.user.sub,
|
||||
|
|
@ -524,7 +463,7 @@ export class EvaluateRecordController extends Controller {
|
|||
await this.evaluateAchievementRepository.save(evaluateAchievement, {
|
||||
data: request,
|
||||
});
|
||||
})
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -564,7 +503,7 @@ export class EvaluateRecordController extends Controller {
|
|||
@Query() assign_id: string,
|
||||
@Query() evaluate_id: string,
|
||||
@Body() requestBody: CreateEvaluateAssessor,
|
||||
@Request() request: RequestWithUser
|
||||
@Request() request: RequestWithUser,
|
||||
) {
|
||||
const director = await this.assignDirectorRepository.findOne({
|
||||
select: ["personal_id"],
|
||||
|
|
@ -599,9 +538,7 @@ export class EvaluateRecordController extends Controller {
|
|||
? requestBody.achievement_other.text
|
||||
: "";
|
||||
evaluate.achievement_other_level =
|
||||
requestBody.achievement_other.text != ""
|
||||
? Number(requestBody.achievement_other.level)
|
||||
: 0;
|
||||
requestBody.achievement_other.text != "" ? Number(requestBody.achievement_other.level) : 0;
|
||||
|
||||
evaluate.achievement_strength_desc = requestBody.achievement_strength_desc;
|
||||
evaluate.achievement_improve_desc = requestBody.achievement_improve_desc;
|
||||
|
|
@ -619,9 +556,7 @@ export class EvaluateRecordController extends Controller {
|
|||
evaluate.discipline5_level = requestBody.discipline5_level;
|
||||
evaluate.behavior_other_desc = requestBody.behavio_orther.text;
|
||||
evaluate.behavior_other_level =
|
||||
requestBody.behavio_orther.text != ""
|
||||
? Number(requestBody.behavio_orther.level)
|
||||
: 0;
|
||||
requestBody.behavio_orther.text != "" ? Number(requestBody.behavio_orther.level) : 0;
|
||||
evaluate.behavior_strength_desc = requestBody.behavior_strength_desc;
|
||||
evaluate.behavior_improve_desc = requestBody.behavior_improve_desc;
|
||||
evaluate.orientation = requestBody.orientation;
|
||||
|
|
@ -631,10 +566,9 @@ export class EvaluateRecordController extends Controller {
|
|||
evaluate.updateUserId = request.user.sub;
|
||||
evaluate.updateFullName = request.user.name;
|
||||
|
||||
const evaluateAssessor = await this.evaluateAssessorRepository.save(
|
||||
evaluate,
|
||||
{ data: request }
|
||||
);
|
||||
const evaluateAssessor = await this.evaluateAssessorRepository.save(evaluate, {
|
||||
data: request,
|
||||
});
|
||||
|
||||
if (evaluateAssessor) {
|
||||
await this.evaluateAchievementRepository.delete({
|
||||
|
|
@ -649,9 +583,7 @@ export class EvaluateRecordController extends Controller {
|
|||
assessor_id: director_id,
|
||||
evaluate_expect_level: Number(expenct.level),
|
||||
output_desc: requestBody.evaluate_ouptut[index].text,
|
||||
evaluate_output_level: Number(
|
||||
requestBody.evaluate_ouptut[index].level
|
||||
),
|
||||
evaluate_output_level: Number(requestBody.evaluate_ouptut[index].level),
|
||||
createdUserId: request.user.sub,
|
||||
createdFullName: request.user.name,
|
||||
updateUserId: request.user.sub,
|
||||
|
|
@ -660,7 +592,7 @@ export class EvaluateRecordController extends Controller {
|
|||
await this.evaluateAchievementRepository.save(evaluateAchievement, {
|
||||
data: request,
|
||||
});
|
||||
})
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -676,19 +608,9 @@ export class EvaluateRecordController extends Controller {
|
|||
*
|
||||
*/
|
||||
@Get("create/commander")
|
||||
async GetCreateCommander(
|
||||
@Query() assign_id: string,
|
||||
@Request() request: RequestWithUser
|
||||
) {
|
||||
async GetCreateCommander(@Query() assign_id: string) {
|
||||
const directorData = await this.assignDirectorRepository.findOne({
|
||||
select: [
|
||||
"personal_id",
|
||||
"dated",
|
||||
"fullname",
|
||||
"position",
|
||||
"posType",
|
||||
"posLevel",
|
||||
],
|
||||
select: ["personal_id", "dated", "fullname", "position", "posType", "posLevel"],
|
||||
where: {
|
||||
assign_id,
|
||||
role: "commander",
|
||||
|
|
@ -714,10 +636,7 @@ export class EvaluateRecordController extends Controller {
|
|||
});
|
||||
|
||||
if (!assign) {
|
||||
return new HttpError(
|
||||
HttpStatusCode.NOT_FOUND,
|
||||
"ไม่พบข้อมูลแบบมอบหมายงาน"
|
||||
);
|
||||
return new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
|
||||
}
|
||||
|
||||
const profileData = await this.personalRepository.findOne({
|
||||
|
|
@ -740,11 +659,7 @@ export class EvaluateRecordController extends Controller {
|
|||
|
||||
const profile = await {
|
||||
id: profileData.personal_id,
|
||||
name:
|
||||
profileData.prefixName +
|
||||
profileData.firstName +
|
||||
" " +
|
||||
profileData.lastName,
|
||||
name: profileData.prefixName + profileData.firstName + " " + profileData.lastName,
|
||||
positionName: profileData.positionName,
|
||||
positionLevelName: profileData.positionLevelName,
|
||||
Oc: profileData.organization,
|
||||
|
|
@ -788,10 +703,7 @@ export class EvaluateRecordController extends Controller {
|
|||
*
|
||||
*/
|
||||
@Get("commander")
|
||||
async GetDataCommander(
|
||||
@Query() assign_id: string,
|
||||
@Query() evaluate_no?: string
|
||||
) {
|
||||
async GetDataCommander(@Query() assign_id: string, @Query() evaluate_no?: string) {
|
||||
const director = await this.assignDirectorRepository.findOne({
|
||||
select: ["personal_id"],
|
||||
where: {
|
||||
|
|
@ -821,12 +733,7 @@ export class EvaluateRecordController extends Controller {
|
|||
}
|
||||
|
||||
const achievementData = await this.evaluateAchievementRepository.find({
|
||||
select: [
|
||||
"output_desc",
|
||||
"evaluate_expect_level",
|
||||
"output_desc",
|
||||
"evaluate_output_level",
|
||||
],
|
||||
select: ["output_desc", "evaluate_expect_level", "output_desc", "evaluate_output_level"],
|
||||
where: {
|
||||
evaluate_id: evaluate.id,
|
||||
},
|
||||
|
|
@ -900,20 +807,18 @@ export class EvaluateRecordController extends Controller {
|
|||
|
||||
await Promise.all(
|
||||
evaluate.map(async (element: any, index: number) => {
|
||||
const achievementData = await this.evaluateAchievementRepository.find(
|
||||
{
|
||||
select: [
|
||||
"output_desc",
|
||||
"evaluate_expect_level",
|
||||
"output_desc",
|
||||
"evaluate_output_level",
|
||||
],
|
||||
where: {
|
||||
evaluate_id: element.id,
|
||||
},
|
||||
order: { output_id: "ASC" },
|
||||
}
|
||||
);
|
||||
const achievementData = await this.evaluateAchievementRepository.find({
|
||||
select: [
|
||||
"output_desc",
|
||||
"evaluate_expect_level",
|
||||
"output_desc",
|
||||
"evaluate_output_level",
|
||||
],
|
||||
where: {
|
||||
evaluate_id: element.id,
|
||||
},
|
||||
order: { output_id: "ASC" },
|
||||
});
|
||||
|
||||
const achievements = await achievementData.map((achievement) => {
|
||||
return {
|
||||
|
|
@ -964,7 +869,7 @@ export class EvaluateRecordController extends Controller {
|
|||
updatedAt: element.updatedAt,
|
||||
achievements: achievements,
|
||||
};
|
||||
})
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -975,10 +880,7 @@ export class EvaluateRecordController extends Controller {
|
|||
});
|
||||
|
||||
if (!assign) {
|
||||
return new HttpError(
|
||||
HttpStatusCode.NOT_FOUND,
|
||||
"ไม่พบข้อมูลแบบมอบหมายงาน"
|
||||
);
|
||||
return new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
|
||||
}
|
||||
|
||||
const experimenteeData = await this.personalRepository.find({
|
||||
|
|
@ -1001,14 +903,7 @@ export class EvaluateRecordController extends Controller {
|
|||
}));
|
||||
|
||||
const directorData = await this.assignDirectorRepository.find({
|
||||
select: [
|
||||
"personal_id",
|
||||
"dated",
|
||||
"fullname",
|
||||
"position",
|
||||
"posType",
|
||||
"posLevel",
|
||||
],
|
||||
select: ["personal_id", "dated", "fullname", "position", "posType", "posLevel"],
|
||||
where: { personal_id: director_id },
|
||||
});
|
||||
|
||||
|
|
@ -1036,7 +931,7 @@ export class EvaluateRecordController extends Controller {
|
|||
async PostDataCommander(
|
||||
@Query() assign_id: string,
|
||||
@Body() requestBody: CreateEvaluateAssessor,
|
||||
@Request() request: RequestWithUser
|
||||
@Request() request: RequestWithUser,
|
||||
) {
|
||||
const director = await this.assignDirectorRepository.findOne({
|
||||
select: ["personal_id"],
|
||||
|
|
@ -1056,10 +951,7 @@ export class EvaluateRecordController extends Controller {
|
|||
where: { id: assign_id },
|
||||
});
|
||||
if (!assign) {
|
||||
return new HttpError(
|
||||
HttpStatusCode.NOT_FOUND,
|
||||
"ไม่พบข้อมูลแบบมอบหมายงาน"
|
||||
);
|
||||
return new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
|
||||
}
|
||||
|
||||
const postData: any = await {
|
||||
|
|
@ -1078,9 +970,7 @@ export class EvaluateRecordController extends Controller {
|
|||
: 0,
|
||||
behavior_other_desc: requestBody.behavio_orther.text,
|
||||
behavior_other_level:
|
||||
requestBody.behavio_orther.text != ""
|
||||
? Number(requestBody.behavio_orther.level)
|
||||
: 0,
|
||||
requestBody.behavio_orther.text != "" ? Number(requestBody.behavio_orther.level) : 0,
|
||||
behavior_strength_desc: requestBody.behavior_strength_desc,
|
||||
behavior_improve_desc: requestBody.behavior_improve_desc,
|
||||
orientation: requestBody.orientation,
|
||||
|
|
@ -1093,10 +983,9 @@ export class EvaluateRecordController extends Controller {
|
|||
updateFullName: request.user.name,
|
||||
};
|
||||
|
||||
const evaluateAssessor = await this.evaluateAssessorRepository.save(
|
||||
postData,
|
||||
{ data: request }
|
||||
);
|
||||
const evaluateAssessor = await this.evaluateAssessorRepository.save(postData, {
|
||||
data: request,
|
||||
});
|
||||
if (evaluateAssessor) {
|
||||
await Promise.all(
|
||||
requestBody.evaluate_expenct_level.map(async (expenct, index) => {
|
||||
|
|
@ -1107,9 +996,7 @@ export class EvaluateRecordController extends Controller {
|
|||
assessor_id: director_id,
|
||||
evaluate_expect_level: Number(expenct.level),
|
||||
output_desc: requestBody.evaluate_ouptut[index].text,
|
||||
evaluate_output_level: Number(
|
||||
requestBody.evaluate_ouptut[index].level
|
||||
),
|
||||
evaluate_output_level: Number(requestBody.evaluate_ouptut[index].level),
|
||||
createdUserId: request.user.sub,
|
||||
createdFullName: request.user.name,
|
||||
updateUserId: request.user.sub,
|
||||
|
|
@ -1118,7 +1005,7 @@ export class EvaluateRecordController extends Controller {
|
|||
await this.evaluateAchievementRepository.save(evaluateAchievement, {
|
||||
data: request,
|
||||
});
|
||||
})
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -1157,7 +1044,7 @@ export class EvaluateRecordController extends Controller {
|
|||
@Query() assign_id: string,
|
||||
@Query() evaluate_id: string,
|
||||
@Body() requestBody: CreateEvaluateAssessor,
|
||||
@Request() request: RequestWithUser
|
||||
@Request() request: RequestWithUser,
|
||||
) {
|
||||
const director = await this.assignDirectorRepository.findOne({
|
||||
select: ["personal_id"],
|
||||
|
|
@ -1191,9 +1078,7 @@ export class EvaluateRecordController extends Controller {
|
|||
? requestBody.achievement_other.text
|
||||
: "";
|
||||
evaluate.achievement_other_level =
|
||||
requestBody.achievement_other.text != ""
|
||||
? Number(requestBody.achievement_other.level)
|
||||
: 0;
|
||||
requestBody.achievement_other.text != "" ? Number(requestBody.achievement_other.level) : 0;
|
||||
|
||||
evaluate.achievement_strength_desc = requestBody.achievement_strength_desc;
|
||||
evaluate.achievement_improve_desc = requestBody.achievement_improve_desc;
|
||||
|
|
@ -1211,9 +1096,7 @@ export class EvaluateRecordController extends Controller {
|
|||
evaluate.discipline5_level = requestBody.discipline5_level;
|
||||
evaluate.behavior_other_desc = requestBody.behavio_orther.text;
|
||||
evaluate.behavior_other_level =
|
||||
requestBody.behavio_orther.text != ""
|
||||
? Number(requestBody.behavio_orther.level)
|
||||
: 0;
|
||||
requestBody.behavio_orther.text != "" ? Number(requestBody.behavio_orther.level) : 0;
|
||||
evaluate.behavior_strength_desc = requestBody.behavior_strength_desc;
|
||||
evaluate.behavior_improve_desc = requestBody.behavior_improve_desc;
|
||||
evaluate.orientation = requestBody.orientation;
|
||||
|
|
@ -1223,10 +1106,9 @@ export class EvaluateRecordController extends Controller {
|
|||
evaluate.updateUserId = request.user.sub;
|
||||
evaluate.updateFullName = request.user.name;
|
||||
|
||||
const evaluateAssessor = await this.evaluateAssessorRepository.save(
|
||||
evaluate,
|
||||
{ data: request }
|
||||
);
|
||||
const evaluateAssessor = await this.evaluateAssessorRepository.save(evaluate, {
|
||||
data: request,
|
||||
});
|
||||
|
||||
if (evaluateAssessor) {
|
||||
await this.evaluateAchievementRepository.delete({
|
||||
|
|
@ -1241,9 +1123,7 @@ export class EvaluateRecordController extends Controller {
|
|||
assessor_id: director_id,
|
||||
evaluate_expect_level: Number(expenct.level),
|
||||
output_desc: requestBody.evaluate_ouptut[index].text,
|
||||
evaluate_output_level: Number(
|
||||
requestBody.evaluate_ouptut[index].level
|
||||
),
|
||||
evaluate_output_level: Number(requestBody.evaluate_ouptut[index].level),
|
||||
createdUserId: request.user.sub,
|
||||
createdFullName: request.user.name,
|
||||
updateUserId: request.user.sub,
|
||||
|
|
@ -1252,7 +1132,7 @@ export class EvaluateRecordController extends Controller {
|
|||
await this.evaluateAchievementRepository.save(evaluateAchievement, {
|
||||
data: request,
|
||||
});
|
||||
})
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue