filter by dna

src/controllers/EvaluationController.ts

@@ -98,9 +98,21 @@ export class EvaluationController {
     const performance = list.map((item) => ({
       id: item.id,
       year: item.lastUpdatedAt ? Extension.ToThaiYear(item.lastUpdatedAt.getFullYear()) : null,
-    type: item.type == "EXPERT" ? "ชำนาญการ" : item.type == "EXPERTISE" ? "เชียวชาญ" : item.type == "SPECIAL_EXPERT" ? "ชำนาญการพิเศษ": null,
+      type:
+        item.type == "EXPERT"
+          ? "ชำนาญการ"
+          : item.type == "EXPERTISE"
+            ? "เชียวชาญ"
+            : item.type == "SPECIAL_EXPERT"
+              ? "ชำนาญการพิเศษ"
+              : null,
       subject: item.subject ? item.subject[0] : null,
-    evaluationResult: item.evaluationResult == "PASS" ? "ผ่าน" : item.evaluationResult == "NOTPASS" ? "ไม่ผ่าน" : null,
+      evaluationResult:
+        item.evaluationResult == "PASS"
+          ? "ผ่าน"
+          : item.evaluationResult == "NOTPASS"
+            ? "ไม่ผ่าน"
+            : null,
     }));
 
     return new HttpSuccess(performance);
@@ -134,6 +146,12 @@ export class EvaluationController {
     try {
       // await new permission().PermissionList(request, "SYS_EVA_REQ");
       let _data = await new permission().PermissionOrgList(request, "SYS_EVA_REQ");
+      await new CallAPI()
+        .PostData(request, "/org/finddna", _data)
+        .then((x) => {
+          _data = x;
+        })
+        .catch((x) => {});
       const [evaluation, total] = await AppDataSource.getRepository(Evaluation)
         .createQueryBuilder("evaluation")
         .andWhere(
@@ -360,7 +378,10 @@ export class EvaluationController {
   @Get("get-announce-template/{id}")
   async getAnnounceTemp(@Path() id: string, @Request() request: RequestWithUser) {
     try {
-      const evaluation = await this.evaluationRepository.findOne({ where: { id } , select: ["id","detailAnnounceStep5Body","detailAnnounceStep5Footer"]});
+      const evaluation = await this.evaluationRepository.findOne({
+        where: { id },
+        select: ["id", "detailAnnounceStep5Body", "detailAnnounceStep5Footer"],
+      });
       if (!evaluation) {
         throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมิน");
       }
@@ -510,13 +531,20 @@ export class EvaluationController {
       if (!evaluation) {
         return `not found data`;
       }
-      let _code = requestBody.type == "EXPERT" ? "ST05-1" : requestBody.type == "EXPERTISE" ? "ST05-1" : requestBody.type == "SPECIAL_EXPERT" ? "ST05-2" : "ST05-1";
+      let _code =
+        requestBody.type == "EXPERT"
+          ? "ST05-1"
+          : requestBody.type == "EXPERTISE"
+            ? "ST05-1"
+            : requestBody.type == "SPECIAL_EXPERT"
+              ? "ST05-2"
+              : "ST05-1";
       const announceTemplate5 = await this.announceTemplateRepository.findOne({
         where: {
-          code : _code
+          code: _code,
         },
-        select: ["detailBody","detailFooter"]
+        select: ["detailBody", "detailFooter"],
-      })
+      });
       const before = null;
       await new CallAPI()
         .GetData(request, `/org/profile/keycloak/commander/${request.user.sub}`)
@@ -540,8 +568,14 @@ export class EvaluationController {
       evaluation.userId = request.user.sub;
       evaluation.detailAnnounceStep5Body = announceTemplate5?.detailBody ?? _null;
       evaluation.detailAnnounceStep5Footer = announceTemplate5?.detailFooter ?? _null;
-      evaluation.positionArea = requestBody.positionArea && requestBody.positionArea !== "" ?  requestBody.positionArea : _null;
+      evaluation.positionArea =
-      evaluation.posExecutive = requestBody.posExecutive && requestBody.posExecutive !== "" ?  requestBody.posExecutive : _null;
+        requestBody.positionArea && requestBody.positionArea !== ""
+          ? requestBody.positionArea
+          : _null;
+      evaluation.posExecutive =
+        requestBody.posExecutive && requestBody.posExecutive !== ""
+          ? requestBody.posExecutive
+          : _null;
       await this.evaluationRepository.save(evaluation, { data: request });
       setLogDataDiff(request, { before, after: evaluation });
 
@@ -1818,10 +1852,9 @@ export class EvaluationController {
               isSendInbox: true,
               isSendNotification: true,
             })
-          .then((x) => {
+            .then((x) => {})
-          })
             .catch((x) => {});
-        })
+        }),
       );
       return new HttpSuccess();
     } catch (error: any) {
@@ -2123,7 +2156,11 @@ export class EvaluationController {
    * @param {string} id id ข้อมูลการประเมิน
    */
   @Put("edit-announce-template/{id}")
-   async editAnnounceTemp(@Path() id: string, @Request() request: RequestWithUser, @Body() body: {detailBody: string, detailFooter: string}) {
+  async editAnnounceTemp(
+    @Path() id: string,
+    @Request() request: RequestWithUser,
+    @Body() body: { detailBody: string; detailFooter: string },
+  ) {
     try {
       await new permission().PermissionUpdate(request, "SYS_EVA_REQ");