ปรับ การทดลองปฏิบัติหน้าที่ราชการ

src/controllers/EvaluateChairmanController.ts

@@ -1,429 +1,543 @@
-import { Controller, Route, Security, Tags, Request, SuccessResponse, Response, Get, Post, Body, Query, Put } from "tsoa"
+import {
-import HttpSuccess from "../interfaces/http-success"
+  Controller,
-import HttpStatusCode from "../interfaces/http-status"
+  Route,
-import { RequestWithUser } from "../middlewares/user"
+  Security,
-import { findEndDate, setLogDataDiff } from "../interfaces/utils"
+  Tags,
-import { AppDataSource } from "../database/data-source"
+  Request,
-import { AssignDirector } from "../entities/AssignDirector"
+  SuccessResponse,
-import HttpError from "../interfaces/http-error"
+  Response,
-import { Assign } from "../entities/Assign"
+  Get,
-import { Personal } from "../entities/Personal"
+  Post,
-import CallAPI from "../interfaces/call-api"
+  Body,
-import { CreateEvaluateChairman, EvaluateChairman } from "../entities/EvaluateChairman"
+  Query,
-import permission from "../interfaces/permission"
+  Put,
+} from "tsoa";
+import HttpSuccess from "../interfaces/http-success";
+import HttpStatusCode from "../interfaces/http-status";
+import { RequestWithUser } from "../middlewares/user";
+import { findEndDate, setLogDataDiff } from "../interfaces/utils";
+import { AppDataSource } from "../database/data-source";
+import { AssignDirector } from "../entities/AssignDirector";
+import HttpError from "../interfaces/http-error";
+import { Assign } from "../entities/Assign";
+import { Personal } from "../entities/Personal";
+import CallAPI from "../interfaces/call-api";
+import {
+  CreateEvaluateChairman,
+  EvaluateChairman,
+} from "../entities/EvaluateChairman";
+import permission from "../interfaces/permission";
 @Route("api/v1/probation/evaluate-chairman")
 @Tags("แบบประเมินผล (คณะกรรมการ)")
 @Security("bearerAuth")
-@Response(HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง")
+@Response(
+  HttpStatusCode.INTERNAL_SERVER_ERROR,
+  "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง"
+)
 export class EvaluateChairmanController extends Controller {
-	private assignDirectorRepository = AppDataSource.getRepository(AssignDirector)
+  private assignDirectorRepository =
-	private assignRepository = AppDataSource.getRepository(Assign)
+    AppDataSource.getRepository(AssignDirector);
-	private evaluateChairmanRepository = AppDataSource.getRepository(EvaluateChairman)
+  private assignRepository = AppDataSource.getRepository(Assign);
-	private personalRepository = AppDataSource.getRepository(Personal)
+  private evaluateChairmanRepository =
+    AppDataSource.getRepository(EvaluateChairman);
+  private personalRepository = AppDataSource.getRepository(Personal);
 
-	/**
+  /**
-	 * API ข้อมูลตอนกดสร้างแบบประเมินผล (คณะกรรมการ)
+   * API ข้อมูลตอนกดสร้างแบบประเมินผล (คณะกรรมการ)
-	 *
+   *
-	 * @summary ข้อมูลตอนกดสร้างแบบประเมินผล (คณะกรรมการ)
+   * @summary ข้อมูลตอนกดสร้างแบบประเมินผล (คณะกรรมการ)
-	 *
+   *
-	 */
+   */
-	@Get("create")
+  @Get("create")
-	async CreateEvaluate(@Query() assign_id: string, @Request() request: RequestWithUser) {
+  async CreateEvaluate(
-		let _workflow = await new permission().Workflow(request, assign_id, "SYS_PROBATION")
+    @Query() assign_id: string,
-		if (_workflow == false) await new permission().PermissionGet(request, "SYS_PROBATION")
+    @Request() request: RequestWithUser
+  ) {
+    let _workflow = await new permission().Workflow(
+      request,
+      assign_id,
+      "SYS_PROBATION"
+    );
+    if (_workflow == false)
+      await new permission().PermissionGet(request, "SYS_PROBATION");
 
-		const director = await this.assignDirectorRepository.findOne({
+    const director = await this.assignDirectorRepository.findOne({
-			select: ["personal_id"],
+      select: ["personal_id"],
-			where: {
+      where: {
-				assign_id,
+        assign_id,
-				role: "chairman",
+        role: "chairman",
-			},
+      },
-		})
+    });
-		if (!director) {
+    if (!director) {
-			throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล")
+      throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
-		}
+    }
-		const director_id = director.personal_id
+    const director_id = director.personal_id;
 
-		const assign = await this.assignRepository.findOne({
+    const assign = await this.assignRepository.findOne({
-			relations: ["profile"],
+      relations: ["profile"],
-			where: { id: assign_id },
+      where: { id: assign_id },
-		})
+    });
-		if (!assign) {
+    if (!assign) {
-			throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน")
+      throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
-		}
+    }
 
-		const profile = await (assign.profile
+    const profile = await (assign.profile
-			? {
+      ? {
-					...assign.profile,
+          ...assign.profile,
-					id: assign.profile.personal_id,
+          id: assign.profile.personal_id,
-					name: assign.profile.prefixName + assign.profile.firstName + " " + assign.profile.lastName,
+          name:
-					Oc: assign.profile.organization,
+            assign.profile.prefixName +
-				}
+            assign.profile.firstName +
-			: null)
+            " " +
+            assign.profile.lastName,
+          Oc: assign.profile.organization,
+        }
+      : null);
 
-		const evaluate_amount = await this.evaluateChairmanRepository.count({
+    const evaluate_amount = await this.evaluateChairmanRepository.count({
-			where: {
+      where: {
-				assign_id,
+        assign_id,
-				director_id,
+        director_id,
-			},
+      },
-		})
+    });
-		const evaluate_no = await (evaluate_amount + 1)
+    const evaluate_no = await (evaluate_amount + 1);
-		const start_date = evaluate_amount == 0 ? assign.date_start : findEndDate(evaluate_amount * 3, assign.date_start)
+    const start_date =
+      evaluate_amount == 0
+        ? assign.date_start
+        : findEndDate(evaluate_amount * 3, assign.date_start);
 
-		const directorData = await this.assignDirectorRepository.find({
+    const directorData = await this.assignDirectorRepository.find({
-			where: { assign_id },
+      where: { assign_id },
-			order: { ordering: "ASC" },
+      order: { ordering: "ASC" },
-		})
+    });
 
-		if (!directorData) {
+    if (!directorData) {
-			throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน")
+      throw new HttpError(
-		}
+        HttpStatusCode.NOT_FOUND,
+        "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน"
+      );
+    }
 
-		let mentors = []
+    let mentors = [];
-		const mentorList = await directorData.filter(x => x.role == "mentor")
+    const mentorList = await directorData.filter((x) => x.role == "mentor");
-		if (mentorList.length > 0) {
+    if (mentorList.length > 0) {
-			for (let index = 0; index < mentorList.length; index++) {
+      for (let index = 0; index < mentorList.length; index++) {
-				const e = await mentorList[index]
+        const e = await mentorList[index];
 
-				mentors.push({
+        mentors.push({
-					personal_id: e.personal_id,
+          personal_id: e.personal_id,
-					dated: e.dated,
+          dated: e.dated,
-					name: e.fullname,
+          name: e.fullname,
-					label: e.fullname + " " + (e.position ? `(${e.position}, ${e.posType}: ${e.posLevel})` : ""),
+          label:
-					position: e.position,
+            e.fullname +
-					posType: e.posType,
+            " " +
-					posLevel: e.posLevel,
+            (e.position ? `(${e.position}${e.posLevel})` : ""),
-				})
+          position: e.position,
-			}
+          posType: e.posType,
-		}
+          posLevel: e.posLevel,
+        });
+      }
+    }
 
-		const commanderData = await (directorData.find(x => x.role == "commander") ?? null)
+    const commanderData = await (directorData.find(
+      (x) => x.role == "commander"
+    ) ?? null);
 
-		const commander =
+    const commander =
-			commanderData != null
+      commanderData != null
-				? {
+        ? {
-						personal_id: commanderData.personal_id,
+            personal_id: commanderData.personal_id,
-						dated: commanderData.dated,
+            dated: commanderData.dated,
-						name: commanderData.fullname,
+            name: commanderData.fullname,
-						label: commanderData.fullname + " " + (commanderData.position ? `(${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})` : ""),
+            label:
-						position: commanderData.position,
+              commanderData.fullname +
-						posType: commanderData.posType,
+              " " +
-						posLevel: commanderData.posLevel,
+              (commanderData.position
-					}
+                ? `(${commanderData.position}${commanderData.posLevel})`
-				: null
+                : ""),
+            position: commanderData.position,
+            posType: commanderData.posType,
+            posLevel: commanderData.posLevel,
+          }
+        : null;
 
-		const chairmanData = await (directorData.find(x => x.role == "chairman") ?? null)
+    const chairmanData = await (directorData.find(
-		const chairman =
+      (x) => x.role == "chairman"
-			chairmanData != null
+    ) ?? null);
-				? {
+    const chairman =
-						personal_id: chairmanData.personal_id,
+      chairmanData != null
-						dated: chairmanData.dated,
+        ? {
-						name: chairmanData.fullname,
+            personal_id: chairmanData.personal_id,
-						label: chairmanData.fullname + " " + (chairmanData.position ? `(${chairmanData.position}, ${chairmanData.posType}: ${chairmanData.posLevel})` : ""),
+            dated: chairmanData.dated,
-						position: chairmanData.position,
+            name: chairmanData.fullname,
-						posType: chairmanData.posType,
+            label:
-						posLevel: chairmanData.posLevel,
+              chairmanData.fullname +
-					}
+              " " +
-				: null
+              (chairmanData.position
+                ? `(${chairmanData.position}${chairmanData.posLevel})`
+                : ""),
+            position: chairmanData.position,
+            posType: chairmanData.posType,
+            posLevel: chairmanData.posLevel,
+          }
+        : null;
 
-		return new HttpSuccess({
+    return new HttpSuccess({
-			person: profile ? profile : null,
+      person: profile ? profile : null,
-			assign,
+      assign,
-			evaluate_no: evaluate_no,
+      evaluate_no: evaluate_no,
-			start_date: start_date,
+      start_date: start_date,
-			end_date: findEndDate(3, start_date),
+      end_date: findEndDate(3, start_date),
-			commander,
+      commander,
-			mentors,
+      mentors,
-			chairman,
+      chairman,
-		})
+    });
-	}
+  }
 
-	/**
+  /**
-	 * API ข้อมูลแบบประเมินผล (คณะกรรมการ)
+   * API ข้อมูลแบบประเมินผล (คณะกรรมการ)
-	 *
+   *
-	 * @summary ข้อมูลแบบประเมินผล (คณะกรรมการ)
+   * @summary ข้อมูลแบบประเมินผล (คณะกรรมการ)
-	 *
+   *
-	 */
+   */
-	@Get("")
+  @Get("")
-	async GetEvaluate(@Request() request: RequestWithUser, @Query() assign_id: string, @Query() evaluate_no?: string) {
+  async GetEvaluate(
-		await new permission().PermissionGet(request, "SYS_PROBATION")
+    @Request() request: RequestWithUser,
-		// ต้องปรับเป็น id ของคนที่ access เข้ามา
+    @Query() assign_id: string,
-		const director = await this.assignDirectorRepository.findOne({
+    @Query() evaluate_no?: string
-			select: ["personal_id"],
+  ) {
-			where: {
+    await new permission().PermissionGet(request, "SYS_PROBATION");
-				assign_id,
+    // ต้องปรับเป็น id ของคนที่ access เข้ามา
-				role: "chairman",
+    const director = await this.assignDirectorRepository.findOne({
-			},
+      select: ["personal_id"],
-		})
+      where: {
-		if (!director) {
+        assign_id,
-			throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล")
+        role: "chairman",
-		}
+      },
-		const director_id = director.personal_id
+    });
-		let evaluate: any = null
+    if (!director) {
-		if (evaluate_no) {
+      throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
-			evaluate = await this.evaluateChairmanRepository.findOne({
+    }
-				where: {
+    const director_id = director.personal_id;
-					director_id,
+    let evaluate: any = null;
-					assign_id,
+    if (evaluate_no) {
-					no: evaluate_no,
+      evaluate = await this.evaluateChairmanRepository.findOne({
-				},
+        where: {
-			})
+          director_id,
-		} else {
+          assign_id,
-			evaluate = await this.evaluateChairmanRepository.find({
+          no: evaluate_no,
-				where: {
+        },
-					director_id,
+      });
-					assign_id,
+    } else {
-				},
+      evaluate = await this.evaluateChairmanRepository.find({
-			})
+        where: {
+          director_id,
+          assign_id,
+        },
+      });
 
-			if (evaluate)
+      if (evaluate)
-				evaluate = await evaluate.map((element: EvaluateChairman) => ({
+        evaluate = await evaluate.map((element: EvaluateChairman) => ({
-					...element,
+          ...element,
-					no: Number(element.no),
+          no: Number(element.no),
-				}))
+        }));
-		}
+    }
 
-		if (!evaluate) {
+    if (!evaluate) {
-			throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบประเมิน")
+      throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบประเมิน");
-		}
+    }
 
-		const assign = await this.assignRepository.findOne({
+    const assign = await this.assignRepository.findOne({
-			where: { id: assign_id },
+      where: { id: assign_id },
-		})
+    });
-		if (!assign) {
+    if (!assign) {
-			throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน")
+      throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
-		}
+    }
 
-		const experimenteeData = await this.personalRepository.find({
+    const experimenteeData = await this.personalRepository.find({
-			select: ["personal_id", "prefixName", "firstName", "lastName", "positionName", "positionLevelName", "organization"],
+      select: [
-			where: { personal_id: assign.personal_id },
+        "personal_id",
-		})
+        "prefixName",
+        "firstName",
+        "lastName",
+        "positionName",
+        "positionLevelName",
+        "organization",
+      ],
+      where: { personal_id: assign.personal_id },
+    });
 
-		const experimentee = await experimenteeData.map(element => ({
+    const experimentee = await experimenteeData.map((element) => ({
-			...element,
+      ...element,
-			name: element.prefixName + element.firstName + " " + element.lastName,
+      name: element.prefixName + element.firstName + " " + element.lastName,
-			Oc: element.organization,
+      Oc: element.organization,
-		}))
+    }));
 
-		const directorData = await this.assignDirectorRepository.find({
+    const directorData = await this.assignDirectorRepository.find({
-			where: { assign_id },
+      where: { assign_id },
-			order: { ordering: "ASC" },
+      order: { ordering: "ASC" },
-		})
+    });
 
-		if (!directorData) {
+    if (!directorData) {
-			throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน")
+      throw new HttpError(
-		}
+        HttpStatusCode.NOT_FOUND,
+        "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน"
+      );
+    }
 
-		let mentors = []
+    let mentors = [];
-		const mentorList = await directorData.filter(x => x.role == "mentor")
+    const mentorList = await directorData.filter((x) => x.role == "mentor");
-		if (mentorList.length > 0) {
+    if (mentorList.length > 0) {
-			for (let index = 0; index < mentorList.length; index++) {
+      for (let index = 0; index < mentorList.length; index++) {
-				const e = await mentorList[index]
+        const e = await mentorList[index];
 
-				mentors.push({
+        mentors.push({
-					personal_id: e.personal_id,
+          personal_id: e.personal_id,
-					dated: e.dated,
+          dated: e.dated,
-					name: e.fullname,
+          name: e.fullname,
-					label: e.fullname + " " + (e.position ? `(${e.position}, ${e.posType}: ${e.posLevel})` : ""),
+          label:
-					position: e.position,
+            e.fullname +
-					posType: e.posType,
+            " " +
-					posLevel: e.posLevel,
+            (e.position ? `(${e.position}${e.posLevel})` : ""),
-				})
+          position: e.position,
-			}
+          posType: e.posType,
-		}
+          posLevel: e.posLevel,
+        });
+      }
+    }
 
-		const commanderData = await (directorData.find(x => x.role == "commander") ?? null)
+    const commanderData = await (directorData.find(
+      (x) => x.role == "commander"
+    ) ?? null);
 
-		const commander =
+    const commander =
-			commanderData != null
+      commanderData != null
-				? {
+        ? {
-						personal_id: commanderData.personal_id,
+            personal_id: commanderData.personal_id,
-						dated: commanderData.dated,
+            dated: commanderData.dated,
-						name: commanderData.fullname,
+            name: commanderData.fullname,
-						label: commanderData.fullname + " " + (commanderData.position ? `(${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})` : ""),
+            label:
-						position: commanderData.position,
+              commanderData.fullname +
-						posType: commanderData.posType,
+              " " +
-						posLevel: commanderData.posLevel,
+              (commanderData.position
-					}
+                ? `(${commanderData.position}${commanderData.posLevel})`
-				: null
+                : ""),
+            position: commanderData.position,
+            posType: commanderData.posType,
+            posLevel: commanderData.posLevel,
+          }
+        : null;
 
-		const chairmanData = await (directorData.find(x => x.role == "chairman") ?? null)
+    const chairmanData = await (directorData.find(
-		const chairman =
+      (x) => x.role == "chairman"
-			chairmanData != null
+    ) ?? null);
-				? {
+    const chairman =
-						personal_id: chairmanData.personal_id,
+      chairmanData != null
-						dated: chairmanData.dated,
+        ? {
-						name: chairmanData.fullname,
+            personal_id: chairmanData.personal_id,
-						label: chairmanData.fullname + " " + (chairmanData.position ? `(${chairmanData.position}, ${chairmanData.posType}: ${chairmanData.posLevel})` : ""),
+            dated: chairmanData.dated,
-						position: chairmanData.position,
+            name: chairmanData.fullname,
-						posType: chairmanData.posType,
+            label:
-						posLevel: chairmanData.posLevel,
+              chairmanData.fullname +
-					}
+              " " +
-				: null
+              (chairmanData.position
+                ? `(${chairmanData.position}${chairmanData.posLevel})`
+                : ""),
+            position: chairmanData.position,
+            posType: chairmanData.posType,
+            posLevel: chairmanData.posLevel,
+          }
+        : null;
 
-		return new HttpSuccess({
+    return new HttpSuccess({
-			experimentee: experimentee,
+      experimentee: experimentee,
-			mentors: mentors,
+      mentors: mentors,
-			commander: commander,
+      commander: commander,
-			chairman: chairman,
+      chairman: chairman,
-			assign,
+      assign,
-			evaluate,
+      evaluate,
-		})
+    });
-	}
+  }
 
-	/**
+  /**
-	 * API บันทึกข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
+   * API บันทึกข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
-	 *
+   *
-	 * @summary บันทึกข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
+   * @summary บันทึกข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
-	 *
+   *
-	 */
+   */
-	@Post("")
+  @Post("")
-	async PostData(@Query() assign_id: string, @Body() requestBody: CreateEvaluateChairman, @Request() request: RequestWithUser) {
+  async PostData(
-		await new permission().PermissionUpdate(request, "SYS_PROBATION")
+    @Query() assign_id: string,
+    @Body() requestBody: CreateEvaluateChairman,
+    @Request() request: RequestWithUser
+  ) {
+    await new permission().PermissionUpdate(request, "SYS_PROBATION");
 
-		const director = await this.assignDirectorRepository.findOne({
+    const director = await this.assignDirectorRepository.findOne({
-			select: ["personal_id"],
+      select: ["personal_id"],
-			where: {
+      where: {
-				assign_id,
+        assign_id,
-				role: "chairman",
+        role: "chairman",
-			},
+      },
-		})
+    });
-		if (!director) {
+    if (!director) {
-			throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล")
+      throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
-		}
+    }
 
-		const director_id = director.personal_id
+    const director_id = director.personal_id;
 
-		const assign = await this.assignRepository.findOne({
+    const assign = await this.assignRepository.findOne({
-			relations: ["profile"],
+      relations: ["profile"],
-			where: { id: assign_id },
+      where: { id: assign_id },
-		})
+    });
-		if (!assign) {
+    if (!assign) {
-			throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน")
+      throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน");
-		}
+    }
 
-		const postData: any = await {
+    const postData: any = await {
-			assign_id,
+      assign_id,
-			...requestBody,
+      ...requestBody,
-			director_id,
+      director_id,
-			no: requestBody.evaluate_no,
+      no: requestBody.evaluate_no,
-			date_start: requestBody.start_date,
+      date_start: requestBody.start_date,
-			personal_id: assign.personal_id,
+      personal_id: assign.personal_id,
 
-			achievement_other_desc: requestBody.achievement_other ? requestBody.achievement_other.text : "",
+      achievement_other_desc: requestBody.achievement_other
-			achievement_other_level: requestBody.achievement_other ? Number(requestBody.achievement_other.level) : 0,
+        ? requestBody.achievement_other.text
-			behavior_other_desc: requestBody.behavior_orther.text,
+        : "",
-			behavior_other_level: requestBody.behavior_orther.text != "" ? Number(requestBody.behavior_orther.level) : 0,
+      achievement_other_level: requestBody.achievement_other
+        ? Number(requestBody.achievement_other.level)
+        : 0,
+      behavior_other_desc: requestBody.behavior_orther.text,
+      behavior_other_level:
+        requestBody.behavior_orther.text != ""
+          ? Number(requestBody.behavior_orther.level)
+          : 0,
 
-			createdUserId: request.user.sub,
+      createdUserId: request.user.sub,
-			createdFullName: request.user.name,
+      createdFullName: request.user.name,
-			updateUserId: request.user.sub,
+      updateUserId: request.user.sub,
-			updateFullName: request.user.name,
+      updateFullName: request.user.name,
-		}
+    };
 
-		await this.evaluateChairmanRepository.save(postData, {
+    await this.evaluateChairmanRepository.save(postData, {
-			data: request,
+      data: request,
-		})
+    });
-		setLogDataDiff(request, { before: null, after: postData })
+    setLogDataDiff(request, { before: null, after: postData });
 
-		if (Number(requestBody.evaluate_no) < 2) {
+    if (Number(requestBody.evaluate_no) < 2) {
-			// #noted cronjob
+      // #noted cronjob
-			// แจ้งประธานเข้ามาบันทึกผลทุก 3 เดือน 2 ครั้ง
+      // แจ้งประธานเข้ามาบันทึกผลทุก 3 เดือน 2 ครั้ง
-			var dateSend = await findEndDate(3, requestBody.start_date)
+      var dateSend = await findEndDate(3, requestBody.start_date);
-			const nextNo = await (Number(requestBody.evaluate_no) + 1)
+      const nextNo = await (Number(requestBody.evaluate_no) + 1);
-			await new CallAPI()
+      await new CallAPI()
-				.PostData(request, "/placement/noti", {
+        .PostData(request, "/placement/noti", {
-					subject: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการครั้งที่ ${nextNo} ${assign.profile.prefixName}${assign.profile.firstName} ${assign.profile.lastName}`,
+          subject: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการครั้งที่ ${nextNo} ${assign.profile.prefixName}${assign.profile.firstName} ${assign.profile.lastName}`,
-					body: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการ (สำหรับคณะกรรมการ) ครั้งที่ ${nextNo} ${assign.profile.prefixName}${assign.profile.firstName} ${assign.profile.lastName}`,
+          body: `ถึงกำหนดประเมินผลการทดลองปฏิบัติหน้าที่ราชการ (สำหรับคณะกรรมการ) ครั้งที่ ${nextNo} ${assign.profile.prefixName}${assign.profile.firstName} ${assign.profile.lastName}`,
-					receiverUserId: director_id,
+          receiverUserId: director_id,
-					payload: "",
+          payload: "",
-					isSendMail: true,
+          isSendMail: true,
-					isSendInbox: true,
+          isSendInbox: true,
-					receiveDate: dateSend,
+          receiveDate: dateSend,
-				})
+        })
-				.catch(error => {
+        .catch((error) => {
-					console.error("Error calling API:", error)
+          console.error("Error calling API:", error);
-				})
+        });
-		}
+    }
 
-		return new HttpSuccess()
+    return new HttpSuccess();
-	}
+  }
 
-	/**
+  /**
-	 * API แก้ไขข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
+   * API แก้ไขข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
-	 *
+   *
-	 * @summary แก้ไขข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
+   * @summary แก้ไขข้อมูลแบบประเมินผล (ผู้บังคับบัญชา)
-	 *
+   *
-	 */
+   */
-	@Put("")
+  @Put("")
-	async UpdateData(
+  async UpdateData(
-		// @Query() assign_id: string,
+    // @Query() assign_id: string,
-		@Query() evaluate_id: string,
+    @Query() evaluate_id: string,
-		@Body() requestBody: CreateEvaluateChairman,
+    @Body() requestBody: CreateEvaluateChairman,
-		@Request() request: RequestWithUser
+    @Request() request: RequestWithUser
-	) {
+  ) {
-		await new permission().PermissionUpdate(request, "SYS_PROBATION")
+    await new permission().PermissionUpdate(request, "SYS_PROBATION");
 
-		let evaluate = await this.evaluateChairmanRepository.findOne({
+    let evaluate = await this.evaluateChairmanRepository.findOne({
-			where: { id: evaluate_id },
+      where: { id: evaluate_id },
-		})
+    });
 
-		const before = evaluate
+    const before = evaluate;
 
-		if (!evaluate) {
+    if (!evaluate) {
-			throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมิน")
+      throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมิน");
-		}
+    }
 
-		evaluate.chairman_dated = requestBody.chairman_dated
+    evaluate.chairman_dated = requestBody.chairman_dated;
-		evaluate.director1_dated = requestBody.director1_dated
+    evaluate.director1_dated = requestBody.director1_dated;
-		evaluate.director2_dated = requestBody.director2_dated
+    evaluate.director2_dated = requestBody.director2_dated;
-		evaluate.knowledge_level = requestBody.knowledge_level
+    evaluate.knowledge_level = requestBody.knowledge_level;
-		evaluate.apply_level = requestBody.apply_level
+    evaluate.apply_level = requestBody.apply_level;
-		evaluate.success_level = requestBody.success_level
+    evaluate.success_level = requestBody.success_level;
-		evaluate.achievement_other_desc = requestBody.achievement_other ? requestBody.achievement_other.text : ""
+    evaluate.achievement_other_desc = requestBody.achievement_other
-		evaluate.achievement_other_level = requestBody.achievement_other.text != "" ? Number(requestBody.achievement_other.level) : 0
+      ? requestBody.achievement_other.text
+      : "";
+    evaluate.achievement_other_level =
+      requestBody.achievement_other.text != ""
+        ? Number(requestBody.achievement_other.level)
+        : 0;
 
-		evaluate.conduct1_level = requestBody.conduct1_level
+    evaluate.conduct1_level = requestBody.conduct1_level;
-		evaluate.conduct2_level = requestBody.conduct2_level
+    evaluate.conduct2_level = requestBody.conduct2_level;
-		evaluate.conduct3_level = requestBody.conduct3_level
+    evaluate.conduct3_level = requestBody.conduct3_level;
-		evaluate.conduct4_level = requestBody.conduct4_level
+    evaluate.conduct4_level = requestBody.conduct4_level;
-		evaluate.moral1_level = requestBody.moral1_level
+    evaluate.moral1_level = requestBody.moral1_level;
-		evaluate.moral2_level = requestBody.moral2_level
+    evaluate.moral2_level = requestBody.moral2_level;
-		evaluate.moral3_level = requestBody.moral3_level
+    evaluate.moral3_level = requestBody.moral3_level;
-		evaluate.discipline1_level = requestBody.discipline1_level
+    evaluate.discipline1_level = requestBody.discipline1_level;
-		evaluate.discipline2_level = requestBody.discipline2_level
+    evaluate.discipline2_level = requestBody.discipline2_level;
-		evaluate.discipline3_level = requestBody.discipline3_level
+    evaluate.discipline3_level = requestBody.discipline3_level;
-		evaluate.discipline4_level = requestBody.discipline4_level
+    evaluate.discipline4_level = requestBody.discipline4_level;
-		evaluate.discipline5_level = requestBody.discipline5_level
+    evaluate.discipline5_level = requestBody.discipline5_level;
-		evaluate.behavior_other_desc = requestBody.behavior_orther.text
+    evaluate.behavior_other_desc = requestBody.behavior_orther.text;
-		evaluate.behavior_other_level = requestBody.behavior_orther.text != "" ? Number(requestBody.behavior_orther.level) : 0
+    evaluate.behavior_other_level =
-		evaluate.develop_orientation_score = requestBody.develop_orientation_score
+      requestBody.behavior_orther.text != ""
-		evaluate.develop_self_learning_score = requestBody.develop_self_learning_score
+        ? Number(requestBody.behavior_orther.level)
-		evaluate.develop_training_seminar_score = requestBody.develop_training_seminar_score
+        : 0;
-		evaluate.develop_other_training_score = requestBody.develop_other_training_score
+    evaluate.develop_orientation_score = requestBody.develop_orientation_score;
-		evaluate.develop_orientation_percent = requestBody.develop_orientation_percent
+    evaluate.develop_self_learning_score =
-		evaluate.develop_self_learning_percent = requestBody.develop_self_learning_percent
+      requestBody.develop_self_learning_score;
-		evaluate.develop_training_seminar_percent = requestBody.develop_training_seminar_percent
+    evaluate.develop_training_seminar_score =
-		evaluate.develop_other_training_percent = requestBody.develop_other_training_percent
+      requestBody.develop_training_seminar_score;
-		evaluate.develop_result = requestBody.develop_result
+    evaluate.develop_other_training_score =
-		evaluate.achievement_score = requestBody.achievement_score
+      requestBody.develop_other_training_score;
-		evaluate.achievement_score_total = requestBody.achievement_score_total
+    evaluate.develop_orientation_percent =
-		evaluate.achievement_percent = requestBody.achievement_percent
+      requestBody.develop_orientation_percent;
-		evaluate.achievement_result = requestBody.achievement_result
+    evaluate.develop_self_learning_percent =
-		evaluate.behavior_score = requestBody.behavior_score
+      requestBody.develop_self_learning_percent;
-		evaluate.behavior_score_total = requestBody.behavior_score_total
+    evaluate.develop_training_seminar_percent =
-		evaluate.behavior_percent = requestBody.behavior_percent
+      requestBody.develop_training_seminar_percent;
-		evaluate.behavior_result = requestBody.behavior_result
+    evaluate.develop_other_training_percent =
-		evaluate.sum_score = requestBody.sum_score
+      requestBody.develop_other_training_percent;
-		evaluate.sum_percent = requestBody.sum_percent
+    evaluate.develop_result = requestBody.develop_result;
-		evaluate.evaluate_result = requestBody.evaluate_result
+    evaluate.achievement_score = requestBody.achievement_score;
+    evaluate.achievement_score_total = requestBody.achievement_score_total;
+    evaluate.achievement_percent = requestBody.achievement_percent;
+    evaluate.achievement_result = requestBody.achievement_result;
+    evaluate.behavior_score = requestBody.behavior_score;
+    evaluate.behavior_score_total = requestBody.behavior_score_total;
+    evaluate.behavior_percent = requestBody.behavior_percent;
+    evaluate.behavior_result = requestBody.behavior_result;
+    evaluate.sum_score = requestBody.sum_score;
+    evaluate.sum_percent = requestBody.sum_percent;
+    evaluate.evaluate_result = requestBody.evaluate_result;
 
-		evaluate.updateUserId = request.user.sub
+    evaluate.updateUserId = request.user.sub;
-		evaluate.updateFullName = request.user.name
+    evaluate.updateFullName = request.user.name;
 
-		await this.evaluateChairmanRepository.save(evaluate, { data: request })
+    await this.evaluateChairmanRepository.save(evaluate, { data: request });
-		setLogDataDiff(request, { before, after: evaluate })
+    setLogDataDiff(request, { before, after: evaluate });
 
-		return new HttpSuccess()
+    return new HttpSuccess();
-	}
+  }
 }

src/controllers/EvaluateController.ts

@@ -80,7 +80,7 @@ export class EvaluateController extends Controller {
 		const commander = await {
 			...commanderData,
 			name: commanderData.fullname,
-			label: `${commanderData.fullname} (${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})`,
+			label: `${commanderData.fullname} (${commanderData.position}${commanderData.posLevel})`,
 		}
 
 		return new HttpSuccess({
@@ -183,7 +183,7 @@ export class EvaluateController extends Controller {
 		const directors = await directorData.map(element => ({
 			...element,
 			name: element.fullname,
-			label: `${element.fullname} (${element.position}, ${element.posType}: ${element.posLevel})`,
+			label: `${element.fullname} (${element.position}${element.posLevel})`,
 		}))
 
 		const experimenteeData = await this.personalRepository.find({

src/controllers/EvaluateRecordController.ts

@@ -114,7 +114,7 @@ export class EvaluateRecordController extends Controller {
 		const commander = await {
 			...commanderData,
 			name: commanderData.fullname,
-			label: `${commanderData.fullname} (${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})`,
+			label: `${commanderData.fullname} (${commanderData.position}${commanderData.posLevel})`,
 		}
 
 		return new HttpSuccess({
@@ -331,7 +331,7 @@ export class EvaluateRecordController extends Controller {
 		const directors = await directorData.map(element => ({
 			...element,
 			name: element.fullname,
-			label: `${element.fullname} (${element.position}, ${element.posType}: ${element.posLevel})`,
+			label: `${element.fullname} (${element.position}${element.posLevel})`,
 		}))
 
 		return new HttpSuccess({
@@ -578,7 +578,7 @@ export class EvaluateRecordController extends Controller {
 		const director = await {
 			...directorData,
 			name: directorData.fullname,
-			label: `${directorData.fullname} (${directorData.position}, ${directorData.posType}: ${directorData.posLevel})`,
+			label: `${directorData.fullname} (${directorData.position}${directorData.posLevel})`,
 		}
 
 		const director_id = director.personal_id
@@ -843,7 +843,7 @@ export class EvaluateRecordController extends Controller {
 		const directors = await directorData.map(element => ({
 			...element,
 			name: element.fullname,
-			label: `${element.fullname} (${element.position}, ${element.posType}: ${element.posLevel})`,
+			label: `${element.fullname} (${element.position}${element.posLevel})`,
 		}))
 
 		return new HttpSuccess({

src/controllers/EvaluateResultController.ts

@@ -23,7 +23,10 @@ import { Assign } from "../entities/Assign";
 import { Personal } from "../entities/Personal";
 import CallAPI from "../interfaces/call-api";
 import { EvaluateChairman } from "../entities/EvaluateChairman";
-import { CreateEvaluateResult, EvaluateResult } from "../entities/EvaluateResult";
+import {
+  CreateEvaluateResult,
+  EvaluateResult,
+} from "../entities/EvaluateResult";
 import permission from "../interfaces/permission";
 
 @Route("api/v1/probation/evaluate-result")
@@ -31,14 +34,17 @@ import permission from "../interfaces/permission";
 @Security("bearerAuth")
 @Response(
   HttpStatusCode.INTERNAL_SERVER_ERROR,
-  "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง",
+  "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง"
 )
 export class EvaluateResultController extends Controller {
-  private assignDirectorRepository = AppDataSource.getRepository(AssignDirector);
+  private assignDirectorRepository =
+    AppDataSource.getRepository(AssignDirector);
   private assignRepository = AppDataSource.getRepository(Assign);
-  private evaluateChairmanRepository = AppDataSource.getRepository(EvaluateChairman);
+  private evaluateChairmanRepository =
+    AppDataSource.getRepository(EvaluateChairman);
   private personalRepository = AppDataSource.getRepository(Personal);
-  private evaluateResultRepository = AppDataSource.getRepository(EvaluateResult);
+  private evaluateResultRepository =
+    AppDataSource.getRepository(EvaluateResult);
 
   /**
    * API ข้อมูลตอนกดสร้างแบบรายงานการประเมินฯ
@@ -47,9 +53,17 @@ export class EvaluateResultController extends Controller {
    *
    */
   @Get("create")
-  async CreateEvaluate(@Query() assign_id: string, @Request() request: RequestWithUser) {
+  async CreateEvaluate(
-    let _workflow = await new permission().Workflow(request, assign_id, "SYS_PROBATION");
+    @Query() assign_id: string,
-    if (_workflow == false) await new permission().PermissionGet(request, "SYS_PROBATION");
+    @Request() request: RequestWithUser
+  ) {
+    let _workflow = await new permission().Workflow(
+      request,
+      assign_id,
+      "SYS_PROBATION"
+    );
+    if (_workflow == false)
+      await new permission().PermissionGet(request, "SYS_PROBATION");
 
     const assign = await this.assignRepository.findOne({
       relations: ["profile"],
@@ -64,7 +78,10 @@ export class EvaluateResultController extends Controller {
           ...assign.profile,
           id: assign.profile.personal_id,
           name:
-            assign.profile.prefixName + assign.profile.firstName + " " + assign.profile.lastName,
+            assign.profile.prefixName +
+            assign.profile.firstName +
+            " " +
+            assign.profile.lastName,
           Oc: assign.profile.organization,
         }
       : null);
@@ -75,7 +92,10 @@ export class EvaluateResultController extends Controller {
     });
 
     if (!directorData) {
-      throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน");
+      throw new HttpError(
+        HttpStatusCode.NOT_FOUND,
+        "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน"
+      );
     }
 
     let mentors = [];
@@ -89,7 +109,9 @@ export class EvaluateResultController extends Controller {
           dated: e.dated,
           name: e.fullname,
           label:
-            e.fullname + " " + (e.position ? `(${e.position}, ${e.posType}: ${e.posLevel})` : ""),
+            e.fullname +
+            " " +
+            (e.position ? `(${e.position}${e.posLevel})` : ""),
           position: e.position,
           posType: e.posType,
           posLevel: e.posLevel,
@@ -97,7 +119,9 @@ export class EvaluateResultController extends Controller {
       }
     }
 
-    const commanderData = await (directorData.find((x) => x.role == "commander") ?? null);
+    const commanderData = await (directorData.find(
+      (x) => x.role == "commander"
+    ) ?? null);
 
     const commander =
       commanderData != null
@@ -109,7 +133,7 @@ export class EvaluateResultController extends Controller {
               commanderData.fullname +
               " " +
               (commanderData.position
-                ? `(${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})`
+                ? `(${commanderData.position}${commanderData.posLevel})`
                 : ""),
             position: commanderData.position,
             posType: commanderData.posType,
@@ -117,7 +141,9 @@ export class EvaluateResultController extends Controller {
           }
         : null;
 
-    const chairmanData = await (directorData.find((x) => x.role == "chairman") ?? null);
+    const chairmanData = await (directorData.find(
+      (x) => x.role == "chairman"
+    ) ?? null);
     const chairman =
       chairmanData != null
         ? {
@@ -128,7 +154,7 @@ export class EvaluateResultController extends Controller {
               chairmanData.fullname +
               " " +
               (chairmanData.position
-                ? `(${chairmanData.position}, ${chairmanData.posType}: ${chairmanData.posLevel})`
+                ? `(${chairmanData.position}${chairmanData.posLevel})`
                 : ""),
             position: chairmanData.position,
             posType: chairmanData.posType,
@@ -136,7 +162,7 @@ export class EvaluateResultController extends Controller {
           }
         : null;
 
-    const resultData = await this.evaluateChairmanRepository.findOne({
+    const resultData = await this.evaluateChairmanRepository.find({
       select: [
         "develop_orientation_score",
         "develop_self_learning_score",
@@ -152,18 +178,34 @@ export class EvaluateResultController extends Controller {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมินผล");
     }
 
-    const develop_complete = await (resultData.develop_orientation_score > 0 &&
+    const result = resultData.map((e) => {
-    resultData.develop_self_learning_score > 0 &&
+      const develop_complete =
-    resultData.develop_training_seminar_score > 0
+        e.develop_orientation_score > 0 &&
-      ? 1
+        e.develop_self_learning_score > 0 &&
-      : 2);
+        e.develop_training_seminar_score
+          ? 1
+          : 2;
 
-    const evaluate_result = await (resultData.evaluate_result == 1 ? 1 : 2);
+      const evaluate_result = e.evaluate_result === 1 ? 1 : 2;
 
-    const result = await {
+      return {
-      develop_complete: develop_complete,
+        develop_complete,
-      evaluate_result: evaluate_result,
+        evaluate_result,
-    };
+      };
+    });
+
+    // const develop_complete = await (resultData.develop_orientation_score > 0 &&
+    // resultData.develop_self_learning_score > 0 &&
+    // resultData.develop_training_seminar_score > 0
+    //   ? 1
+    //   : 2);
+
+    // const evaluate_result = await (resultData.evaluate_result == 1 ? 1 : 2);
+
+    // const result = await {
+    //   develop_complete: develop_complete,
+    //   evaluate_result: evaluate_result,
+    // };
 
     return new HttpSuccess({
       person: profile,
@@ -185,7 +227,7 @@ export class EvaluateResultController extends Controller {
   async GetEvaluate(
     @Request() request: RequestWithUser,
     @Query() assign_id: string,
-    @Query() evaluate_no?: string,
+    @Query() evaluate_no?: string
   ) {
     await new permission().PermissionGet(request, "SYS_PROBATION");
 
@@ -201,14 +243,26 @@ export class EvaluateResultController extends Controller {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล");
     }
     const director_id = director.personal_id;
-
+    let evaluate: any = null;
-    const evaluate = await this.evaluateResultRepository.findOne({
+    if (evaluate_no) {
-      where: {
+      evaluate = await this.evaluateResultRepository.findOne({
-        director_id,
+        where: {
-        assign_id,
+          director_id,
-      },
+          assign_id,
-    });
+          no: evaluate_no,
-
+        },
+      });
+      // if (!evaluate) {
+      //   throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบประเมิน");
+      // }
+    } else {
+      evaluate = await this.evaluateResultRepository.findOne({
+        where: {
+          director_id,
+          assign_id,
+        },
+      });
+    }
     if (!evaluate) {
       return new HttpSuccess(null);
     }
@@ -243,10 +297,15 @@ export class EvaluateResultController extends Controller {
     const experimentee = await {
       ...experimenteeData,
       name:
-        experimenteeData.prefixName + experimenteeData.firstName + " " + experimenteeData.lastName,
+        experimenteeData.prefixName +
-      PositionLevel: experimenteeData.positionName + experimenteeData.positionLevelName,
+        experimenteeData.firstName +
+        " " +
+        experimenteeData.lastName,
+      PositionLevel:
+        experimenteeData.positionName + experimenteeData.positionLevelName,
       Department: splitOcAmount > 2 ? splitOc[splitOcAmount - 3] : "-",
-      OrganizationOrganization: splitOcAmount > 1 ? splitOc[splitOcAmount - 2] : "-",
+      OrganizationOrganization:
+        splitOcAmount > 1 ? splitOc[splitOcAmount - 2] : "-",
       Oc: experimenteeData.orgRootName,
     };
 
@@ -256,7 +315,10 @@ export class EvaluateResultController extends Controller {
     });
 
     if (!directorData) {
-      throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน");
+      throw new HttpError(
+        HttpStatusCode.NOT_FOUND,
+        "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน"
+      );
     }
 
     let mentors = [];
@@ -270,7 +332,9 @@ export class EvaluateResultController extends Controller {
           dated: e.dated,
           name: e.fullname,
           label:
-            e.fullname + " " + (e.position ? `(${e.position}, ${e.posType}: ${e.posLevel})` : ""),
+            e.fullname +
+            " " +
+            (e.position ? `(${e.position}${e.posLevel})` : ""),
           position: e.position + e.posLevel,
           posType: e.posType,
           posLevel: e.posLevel,
@@ -278,7 +342,9 @@ export class EvaluateResultController extends Controller {
       }
     }
 
-    const commanderData = await (directorData.find((x) => x.role == "commander") ?? null);
+    const commanderData = await (directorData.find(
+      (x) => x.role == "commander"
+    ) ?? null);
 
     const commander =
       commanderData != null
@@ -290,7 +356,7 @@ export class EvaluateResultController extends Controller {
               commanderData.fullname +
               " " +
               (commanderData.position
-                ? `(${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})`
+                ? `(${commanderData.position}${commanderData.posLevel})`
                 : ""),
             position: commanderData.position + commanderData.posLevel,
             posType: commanderData.posType,
@@ -298,7 +364,9 @@ export class EvaluateResultController extends Controller {
           }
         : null;
 
-    const chairmanData = await (directorData.find((x) => x.role == "chairman") ?? null);
+    const chairmanData = await (directorData.find(
+      (x) => x.role == "chairman"
+    ) ?? null);
     const chairman =
       chairmanData != null
         ? {
@@ -309,7 +377,7 @@ export class EvaluateResultController extends Controller {
               chairmanData.fullname +
               " " +
               (chairmanData.position
-                ? `(${chairmanData.position}, ${chairmanData.posType}: ${chairmanData.posLevel})`
+                ? `(${chairmanData.position}${chairmanData.posLevel})`
                 : ""),
             position: chairmanData.position + chairmanData.posLevel,
             posType: chairmanData.posType,
@@ -323,7 +391,7 @@ export class EvaluateResultController extends Controller {
       mentors,
       experimentee,
       assign,
-      evaluate: evaluate,
+      evaluate: evaluate ? evaluate : null,
     });
   }
 
@@ -337,7 +405,7 @@ export class EvaluateResultController extends Controller {
   async PostData(
     @Query() assign_id: string,
     @Body() requestBody: CreateEvaluateResult,
-    @Request() request: RequestWithUser,
+    @Request() request: RequestWithUser
   ) {
     await new permission().PermissionUpdate(request, "SYS_PROBATION");
 
@@ -366,10 +434,11 @@ export class EvaluateResultController extends Controller {
       assign_id,
       ...requestBody,
       director_id,
-      no: 1,
+      no: requestBody.evaluate_no,
       personal_id: assign.personal_id,
       date_start: requestBody.start_date,
-      expand_month: requestBody.pass_result == 3 ? Number(requestBody.expand_month) : 0,
+      expand_month:
+        requestBody.pass_result == 3 ? Number(requestBody.expand_month) : 0,
 
       createdUserId: request.user.sub,
       createdFullName: request.user.name,
@@ -430,7 +499,7 @@ export class EvaluateResultController extends Controller {
     @Query() assign_id: string,
     @Query() evaluate_id: string,
     @Body() requestBody: CreateEvaluateResult,
-    @Request() request: RequestWithUser,
+    @Request() request: RequestWithUser
   ) {
     await new permission().PermissionUpdate(request, "SYS_PROBATION");
 

src/entities/EvaluateResult.ts

@@ -1,4 +1,10 @@
-import { Entity, Column, ManyToOne, JoinColumn, PrimaryGeneratedColumn } from "typeorm";
+import {
+  Entity,
+  Column,
+  ManyToOne,
+  JoinColumn,
+  PrimaryGeneratedColumn,
+} from "typeorm";
 import { EntityBase } from "./base/Base";
 import { Assign } from "./Assign";
 
@@ -102,6 +108,7 @@ export class CreateEvaluateResult {
   chairman_dated: Date | null;
   director1_dated: Date | null;
   director2_dated: Date | null;
+  evaluate_no: number;
 }
 
 export type UpdateEvaluateResult = Partial<CreateEvaluateResult>;