Merge branch 'develop'

src/controllers/CommandController.ts

@@ -3164,8 +3164,8 @@ export class CommandController extends Controller {
 
         posMaster.current_holderId = item.profileId;
         posMaster.lastUpdatedAt = new Date();
-        posMaster.conditionReason = _null;
+        // posMaster.conditionReason = _null;
-        posMaster.isCondition = false;
+        // posMaster.isCondition = false;
         if (posMasterOld != null) {
           await this.posMasterRepository.save(posMasterOld);
           await CreatePosMasterHistoryOfficer(posMasterOld.id, req);
@@ -3555,7 +3555,7 @@ export class CommandController extends Controller {
             }
           })
           if (curPosMaster && clearProfile.LeaveType != "RETIRE_OUT_EMP") {
-            await CreatePosMasterHistoryOfficer(curPosMaster.id, req);
+            await CreatePosMasterHistoryOfficer(curPosMaster.id, req, "DELETE");
           }
         }
 
@@ -3608,8 +3608,8 @@ export class CommandController extends Controller {
               }
               posMaster.current_holderId = profile.id;
               posMaster.lastUpdatedAt = new Date();
-              posMaster.conditionReason = _null;
+              // posMaster.conditionReason = _null;
-              posMaster.isCondition = false;
+              // posMaster.isCondition = false;
               await this.posMasterRepository.save(posMaster);
               const positionNew = await this.positionRepository.findOne({
                 where: {
@@ -6067,8 +6067,8 @@ export class CommandController extends Controller {
 
             posMaster.current_holderId = profile.id;
             posMaster.lastUpdatedAt = new Date();
-            posMaster.conditionReason = _null;
+            // posMaster.conditionReason = _null;
-            posMaster.isCondition = false;
+            // posMaster.isCondition = false;
             if (posMasterOld != null) {
               await this.posMasterRepository.save(posMasterOld);
               await CreatePosMasterHistoryOfficer(posMasterOld.id, req);

src/controllers/PositionController.ts

@@ -3642,8 +3642,8 @@ export class PositionController extends Controller {
     // dataMaster.next_holderId = requestBody.profileId;
     dataMaster.lastUpdatedAt = new Date();
     //add on
-    dataMaster.conditionReason = _null;
+    // dataMaster.conditionReason = _null;
-    dataMaster.isCondition = false;
+    // dataMaster.isCondition = false;
     //เช็คถ้า revision ปัจจุบันให้ปั๊มที่ profile
     const chkRevision = await this.orgRevisionRepository.findOne({
       where: { id: dataMaster.orgRevisionId },
@@ -3696,7 +3696,7 @@ export class PositionController extends Controller {
     }
 
     if (dataMaster.orgRevision.orgRevisionIsCurrent) {
-      await CreatePosMasterHistoryOfficer(dataMaster.id, request);
+      await CreatePosMasterHistoryOfficer(dataMaster.id, request, "DELETE");
     }
 
     let _profileId: string = "";
@@ -3715,6 +3715,8 @@ export class PositionController extends Controller {
         positionIsSelected: false,
       });
     });
+
+
     // //เช็คถ้า revision ปัจจุบันให้ปั๊มที่ profile
     // const chkRevision = await this.orgRevisionRepository.findOne({
     //   where: { id: dataMaster.orgRevisionId },
@@ -4935,8 +4937,8 @@ export class PositionController extends Controller {
     posMaster.current_holderId = body.profileId;
     posMaster.lastUpdatedAt = new Date();
     const _null: any = null;
-    posMaster.conditionReason = _null;
+    // posMaster.conditionReason = _null;
-    posMaster.isCondition = false;
+    // posMaster.isCondition = false;
     if (posMasterOld != null) {
       await this.posMasterRepository.save(posMasterOld);
       await CreatePosMasterHistoryOfficer(posMasterOld.id, request);

src/controllers/ProfileController.ts

@@ -86,6 +86,7 @@ import { ProfileSalaryHistory } from "../entities/ProfileSalaryHistory";
 import { ProfileAssistance } from "../entities/ProfileAssistance";
 import { CommandRecive } from "../entities/CommandRecive";
 import { EmployeePosMaster } from "../entities/EmployeePosMaster";
+import { getTopDegrees } from "../services/PositionService";
 @Route("api/v1/org/profile")
 @Tags("Profile")
 @Security("bearerAuth")
@@ -6292,7 +6293,9 @@ export class ProfileController extends Controller {
       //       : undefined,
       // })
       .where("current_holders.orgRevisionId = :orgRevisionId", {
-        orgRevisionId: (await this.orgRevisionRepo.findOne({ where: { orgRevisionIsCurrent: true } }))?.id
+        orgRevisionId: (
+          await this.orgRevisionRepo.findOne({ where: { orgRevisionIsCurrent: true } })
+        )?.id,
       })
       .andWhere(
         _data.root != undefined && _data.root != null
@@ -8148,7 +8151,7 @@ export class ProfileController extends Controller {
       salary: profile ? profile.amount : null,
       education:
         profile && profile.profileEducations.length > 0
-          ? `${profile.profileEducations[0].degree ?? ""} ${profile.profileEducations[0].field ?? ""}`
+          ? await getTopDegrees(profile.profileEducations)
           : "-",
       statusCheckEdit: profile.statusCheckEdit,
       isEdit: permissionProflile?.isEdit ?? false,
@@ -8345,7 +8348,7 @@ export class ProfileController extends Controller {
       mouthSalaryAmount: profile ? profile.mouthSalaryAmount : null,
       education:
         profile && profile.profileEducations.length > 0
-          ? `${profile.profileEducations[0].degree ?? ""} ${profile.profileEducations[0].field ?? ""}`
+          ? await getTopDegrees(profile.profileEducations)
           : "",
       dateAppoint: profile.dateAppoint,
       avatarUrl:
@@ -8497,7 +8500,7 @@ export class ProfileController extends Controller {
       salary: profile.amount,
       education:
         profile && profile.profileEducations.length > 0
-          ? `${profile.profileEducations[0].degree ?? ""} ${profile.profileEducations[0].field ?? ""}`
+          ? await getTopDegrees(profile.profileEducations)
           : "-",
     };
 

src/controllers/ProfileEmployeeController.ts

@@ -78,6 +78,7 @@ import { ProfileAssistance } from "../entities/ProfileAssistance";
 import { ProfileChangeName } from "../entities/ProfileChangeName";
 import { ProfileChildren } from "../entities/ProfileChildren";
 import { ProfileDuty } from "../entities/ProfileDuty";
+import { getTopDegrees } from "../services/PositionService";
 @Route("api/v1/org/profile-employee")
 @Tags("ProfileEmployee")
 @Security("bearerAuth")
@@ -1107,14 +1108,14 @@ export class ProfileEmployeeController extends Controller {
               : null,
             disciplineDetail: item.detail ?? null,
             refNo: Extension.ToThaiNumber(item.refCommandNo) ?? null,
-            level: item.level ?? ""
+            level: item.level ?? "",
           }))
         : [
             {
               disciplineYear: "-",
               disciplineDetail: "-",
               refNo: "-",
-              level: "-"
+              level: "-",
             },
           ];
 
@@ -1164,7 +1165,9 @@ export class ProfileEmployeeController extends Controller {
             salary:
               item.amount != null ? Extension.ToThaiNumber(item.amount.toLocaleString()) : null,
             special:
-              item.amountSpecial != null ? Extension.ToThaiNumber(item.amountSpecial.toLocaleString()) : null,
+              item.amountSpecial != null
+                ? Extension.ToThaiNumber(item.amountSpecial.toLocaleString())
+                : null,
             rank: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null,
             refAll: item.remark ? Extension.ToThaiNumber(item.remark) : null,
             positionLevel: item.positionLevel
@@ -1314,7 +1317,7 @@ export class ProfileEmployeeController extends Controller {
         "profileLeave.dateLeaveEnd AS dateLeaveEnd",
         "profileLeave.leaveDays AS leaveDays",
         "profileLeave.reason AS reason",
-        "leaveType.name as name"
+        "leaveType.name as name",
       ])
       .where("profileLeave.profileEmployeeId = :profileId", { profileId: id })
       .andWhere("leaveType.code IN (:...codes)", { codes: ["LV-008", "LV-009", "LV-010"] })
@@ -1324,9 +1327,11 @@ export class ProfileEmployeeController extends Controller {
     const leaves2 =
       leave2_raw.length > 0
         ? leave2_raw.map((item) => ({
-            date: item.dateLeaveStart && item.dateLeaveEnd
+            date:
-              ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateLeaveStart)) + " - " 
+              item.dateLeaveStart && item.dateLeaveEnd
-              + Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateLeaveEnd))
+                ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateLeaveStart)) +
+                  " - " +
+                  Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateLeaveEnd))
                 : "-",
             type: item.name || "-",
             leaveDays: item.leaveDays ? Extension.ToThaiNumber(item.leaveDays.toString()) : "-",
@@ -1392,8 +1397,9 @@ export class ProfileEmployeeController extends Controller {
       where: { profileEmployeeId: id },
       order: { createdAt: "ASC" },
     });
-    const history = profileHistory.length > 0 
+    const history =
-      ? profileHistory.map(item => ({
+      profileHistory.length > 0
+        ? profileHistory.map((item) => ({
             birthDateOld: item.birthDateOld
               ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.birthDateOld))
               : "",
@@ -1405,8 +1411,8 @@ export class ProfileEmployeeController extends Controller {
             {
               birthDateOld: "-",
               birthDate: "-",
-        }
+            },
-      ]
+          ];
 
     const position_raw = await this.salaryRepo.find({
       where: {
@@ -1555,15 +1561,16 @@ export class ProfileEmployeeController extends Controller {
               : "",
             pointSum: item.pointSum ? Extension.ToThaiNumber(item.pointSum.toString()) : "",
             pointSumTh: item.pointSum ? Extension.textPoint(item.pointSum) : "",
-            level: item.pointSum < 60.00
+            level:
+              item.pointSum < 60.0
                 ? "ต้องปรับปรุง (คะแนนต่ำกว่าร้อยละ ๖๐.๐๐)"
-              : item.pointSum <= 69.99 && item.pointSum >= 60.00
+                : item.pointSum <= 69.99 && item.pointSum >= 60.0
                   ? "พอใช้ (คะแนนร้อยละ ๖๐.๐๐ - ๖๙.๙๙)"
-                : item.pointSum <= 79.99 && item.pointSum >= 70.00
+                  : item.pointSum <= 79.99 && item.pointSum >= 70.0
                     ? "ดี (คะแนนร้อยละ ๗๐.๐๐ - ๗๙.๙๙)"
-                  : item.pointSum <= 89.99 && item.pointSum >= 80.00
+                    : item.pointSum <= 89.99 && item.pointSum >= 80.0
                       ? "ดีมาก (คะแนนร้อยละ ๘๐.๐๐ - ๘๙.๙๙)"
-                    : "ดีเด่น (คะแนนร้อยละ ๙๐.๐๐ ขึ้นไป)"
+                      : "ดีเด่น (คะแนนร้อยละ ๙๐.๐๐ ขึ้นไป)",
           }))
         : [
             {
@@ -4017,21 +4024,23 @@ export class ProfileEmployeeController extends Controller {
   ) {
     // ค้นหารายชื่อถ้าไม่ส่ง system มาให้ default ตามทะเบียนประวัติ
     let _system: string = "SYS_REGISTRY_EMP";
-    if(body.system)
+    if (body.system) _system = body.system;
-      _system = body.system;
     let _data = await new permission().PermissionOrgList(request, _system);
-    const findRevision = await this.orgRevisionRepo.findOne({ where: { orgRevisionIsCurrent: true } });
+    const findRevision = await this.orgRevisionRepo.findOne({
+      where: { orgRevisionIsCurrent: true },
+    });
     if (!findRevision) {
       throw new HttpError(HttpStatus.NOT_FOUND, "not found. OrgRevision");
     }
-    let queryLike = "1=1"
+    let queryLike = "1=1";
     switch (body.fieldName) {
       case "citizenId":
         queryLike = "profile.citizenId LIKE :keyword";
         break;
 
       case "fullName":
-        queryLike = "CONCAT(profile.prefix, profile.firstName, ' ', profile.lastName) LIKE :keyword";
+        queryLike =
+          "CONCAT(profile.prefix, profile.firstName, ' ', profile.lastName) LIKE :keyword";
         break;
 
       case "position":
@@ -4063,7 +4072,7 @@ export class ProfileEmployeeController extends Controller {
         break;
 
       default:
-        queryLike = "1=1"
+        queryLike = "1=1";
         break;
     }
 
@@ -5608,7 +5617,8 @@ export class ProfileEmployeeController extends Controller {
       posNo: orgRevisionRef?.posMasterNo,
       positionExecutive: "",
       positionType: profile.posType?.posTypeName,
-      positionLevel: profile.posType && profile.posLevel
+      positionLevel:
+        profile.posType && profile.posLevel
           ? `${profile.posType?.posTypeShortName} ${profile.posLevel?.posLevelName}`
           : "",
       amountSpecial: profile.amountSpecial,
@@ -6366,7 +6376,7 @@ export class ProfileEmployeeController extends Controller {
       salary: profile.amount,
       education:
         profile && profile.profileEducations.length > 0
-          ? `${profile.profileEducations[0].degree ?? ""} ${profile.profileEducations[0].field ?? ""}`
+          ? await getTopDegrees(profile.profileEducations)
           : "-",
       statusCheckEdit: profile.statusCheckEdit,
       isEdit: permissionProflile?.isEdit ?? false,

src/controllers/ProfileEmployeeTempController.ts

@@ -68,6 +68,7 @@ import permission from "../interfaces/permission";
 import axios from "axios";
 import { deleteUser } from "../keycloak";
 import { ProfileSalaryHistory } from "../entities/ProfileSalaryHistory";
+import { getTopDegrees } from "../services/PositionService";
 @Route("api/v1/org/profile-temp")
 @Tags("ProfileEmployee")
 @Security("bearerAuth")
@@ -688,7 +689,9 @@ export class ProfileEmployeeTempController extends Controller {
             Salary:
               item.amount != null ? Extension.ToThaiNumber(item.amount.toLocaleString()) : null,
             Special:
-              item.amountSpecial != null ? Extension.ToThaiNumber(item.amountSpecial.toLocaleString()) : null,
+              item.amountSpecial != null
+                ? Extension.ToThaiNumber(item.amountSpecial.toLocaleString())
+                : null,
             Rank: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null,
             RefAll: item.remark ? Extension.ToThaiNumber(item.remark) : null,
             PositionLevel:
@@ -1142,8 +1145,8 @@ export class ProfileEmployeeTempController extends Controller {
         {
           statusTemp: "PENDING",
           type: "TEMP",
-          keycloak: request.user.sub
+          keycloak: request.user.sub,
-        }
+        },
       )
       .getManyAndCount();
     const data = await Promise.all(
@@ -1510,15 +1513,12 @@ export class ProfileEmployeeTempController extends Controller {
     } else if (searchField == "position") {
       queryLike = "profileEmployee.position LIKE :keyword";
     }
-    let _conditionAll =
+    let _conditionAll = `current_holderTemps.orgRootId is null AND current_holderTemps.orgChild1Id is null AND
-      `current_holderTemps.orgRootId is null AND current_holderTemps.orgChild1Id is null AND
       current_holderTemps.orgChild2Id is null AND current_holderTemps.orgChild3Id is null AND
       current_holderTemps.orgChild4Id is null AND profileEmployee.createdUserId = :keycloak AND
-      profileEmployee.employeeClass = :type`
+      profileEmployee.employeeClass = :type`;
-    let _conditionFullname=
+    let _conditionFullname = `CONCAT(profileEmployee.prefix, profileEmployee.firstName, ' ', profileEmployee.lastName) LIKE :keyword`;
-      `CONCAT(profileEmployee.prefix, profileEmployee.firstName, ' ', profileEmployee.lastName) LIKE :keyword`
+    let _conditionCitizenId = `profileEmployee.citizenId LIKE :keyword`;
-    let _conditionCitizenId =
-      `profileEmployee.citizenId LIKE :keyword`
     const findRevision = await this.orgRevisionRepo.findOne({
       where: { orgRevisionIsCurrent: true },
     });
@@ -1611,42 +1611,29 @@ export class ProfileEmployeeTempController extends Controller {
           keyword2: `${posLevel}`,
         },
       )
-      .andWhere(
+      .andWhere("profileEmployee.employeeClass = :type", {
-        "profileEmployee.employeeClass = :type", {
+        type: type ? type.trim().toLocaleUpperCase() : "TEMP",
-          type: type ? type.trim().toLocaleUpperCase() : "TEMP" 
+      })
-        }
-      )
       .orWhere(
         new Brackets((qb) => {
           if (!searchKeyword) {
-            qb.andWhere(
+            qb.andWhere(_conditionAll, {
-              _conditionAll, 
-              {
               keycloak: request.user.sub,
-                type: type ? type.trim().toLocaleUpperCase() : "TEMP"
+              type: type ? type.trim().toLocaleUpperCase() : "TEMP",
-              }
+            });
-            )
+          } else {
-          }
-          else {
             if (searchField != "citizenId") {
-              qb.andWhere(
+              qb.andWhere(`${_conditionAll} AND ${_conditionFullname}`, {
-               `${_conditionAll} AND ${_conditionFullname}`,
-              {
                 keyword: `%${searchKeyword}%`,
                 keycloak: request.user.sub,
-                type: type ? type.trim().toLocaleUpperCase() : "TEMP"
+                type: type ? type.trim().toLocaleUpperCase() : "TEMP",
-              },
+              });
-            )
+            } else {
-            }
+              qb.andWhere(`${_conditionAll} AND ${_conditionCitizenId}`, {
-            else {
-              qb.andWhere(
-               `${_conditionAll} AND ${_conditionCitizenId}`,
-                {
                 keyword: `%${searchKeyword}%`,
                 keycloak: request.user.sub,
-                  type: type ? type.trim().toLocaleUpperCase() : "TEMP"
+                type: type ? type.trim().toLocaleUpperCase() : "TEMP",
-                },
+              });
-              )
             }
           }
         }),
@@ -1660,18 +1647,20 @@ export class ProfileEmployeeTempController extends Controller {
           _data.current_holderTemps.length == 0
             ? null
             : _data.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                _data.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4 !=
+                _data.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)
-                  null
+                  ?.orgChild4 != null
               ? `${_data.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4.orgChild4ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
               : _data.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id) != null &&
                   _data.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)
                     ?.orgChild3 != null
                 ? `${_data.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3.orgChild3ShortName} ${_data.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
-                : _data.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id) != null &&
+                : _data.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id) !=
+                      null &&
                     _data.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)
                       ?.orgChild2 != null
                   ? `${_data.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2.orgChild2ShortName} ${_data.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
-                  : _data.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id) != null &&
+                  : _data.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id) !=
+                        null &&
                       _data.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)
                         ?.orgChild1 != null
                     ? `${_data.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1.orgChild1ShortName} ${_data.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
@@ -2199,14 +2188,15 @@ export class ProfileEmployeeTempController extends Controller {
   ) {
     // ค้นหารายชื่อถ้าไม่ส่ง system มาให้ default ตามทะเบียนประวัติ
     let _system: string = "SYS_REGISTRY_TEMP";
-    if(body.system)
+    if (body.system) _system = body.system;
-      _system = body.system;
     let _data = await new permission().PermissionOrgList(request, _system);
-    const findRevision = await this.orgRevisionRepo.findOne({ where: { orgRevisionIsCurrent: true } });
+    const findRevision = await this.orgRevisionRepo.findOne({
+      where: { orgRevisionIsCurrent: true },
+    });
     if (!findRevision) {
       throw new HttpError(HttpStatus.NOT_FOUND, "not found. OrgRevision");
     }
-    let queryLike = "1=1"
+    let queryLike = "1=1";
     switch (body.fieldName) {
       case "citizenId":
         queryLike = "profile.citizenId LIKE :keyword";
@@ -2221,11 +2211,12 @@ export class ProfileEmployeeTempController extends Controller {
         break;
 
       case "fullName":
-        queryLike = "CONCAT(profile.prefix, profile.firstName, ' ', profile.lastName) LIKE :keyword";
+        queryLike =
+          "CONCAT(profile.prefix, profile.firstName, ' ', profile.lastName) LIKE :keyword";
         break;
 
       default:
-        queryLike = "1=1"
+        queryLike = "1=1";
         break;
     }
 
@@ -2298,18 +2289,20 @@ export class ProfileEmployeeTempController extends Controller {
           item.current_holderTemps.length == 0
             ? null
             : item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4 !=
+                item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)
-                  null
+                  ?.orgChild4 != null
               ? `${item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4.orgChild4ShortName} ${item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
               : item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                  item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3 !=
+                  item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)
-                    null
+                    ?.orgChild3 != null
                 ? `${item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3.orgChild3ShortName} ${item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
-                : item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id) != null &&
+                : item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id) !=
+                      null &&
                     item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)
                       ?.orgChild2 != null
                   ? `${item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2.orgChild2ShortName} ${item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
-                  : item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id) != null &&
+                  : item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id) !=
+                        null &&
                       item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)
                         ?.orgChild1 != null
                     ? `${item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1.orgChild1ShortName} ${item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
@@ -2323,7 +2316,8 @@ export class ProfileEmployeeTempController extends Controller {
         const root =
           item.current_holderTemps.length == 0 ||
           (item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id) != null &&
-            item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot == null)
+            item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot ==
+              null)
             ? null
             : item.current_holderTemps.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot;
 
@@ -3458,7 +3452,8 @@ export class ProfileEmployeeTempController extends Controller {
       posNo: orgRevisionRef?.posMasterNo,
       positionExecutive: "",
       positionType: profile.posType?.posTypeName,
-      positionLevel: profile.posType && profile.posLevel
+      positionLevel:
+        profile.posType && profile.posLevel
           ? `${profile.posType?.posTypeShortName} ${profile.posLevel?.posLevelName}`
           : "",
       amountSpecial: profile.amountSpecial,
@@ -4169,7 +4164,7 @@ export class ProfileEmployeeTempController extends Controller {
       salary: profile.amount,
       education:
         profile && profile.profileEducations.length > 0
-          ? `${profile.profileEducations[0].degree ?? ""} ${profile.profileEducations[0].field ?? ""}`
+          ? await getTopDegrees(profile.profileEducations)
           : "-",
     };
 

src/entities/Registry.ts

@@ -256,10 +256,10 @@ export class Registry extends EntityBase {
     birthdate: Date;
 
     @Column({
+        type: "text",
         nullable: true,
         comment: "วุฒิการศึกษา",
-        length: 255,
+        default: null
-        default: null,
     })
     degrees: string;
 
@@ -350,18 +350,18 @@ export class Registry extends EntityBase {
     Educations: string;
 
     @Column({
+        type: "text",
         nullable: true,
         comment: "ระดับศึกษา",
-        length: 255,
+        default: null
-        default: null,
     })
     educationLevels: string;
 
     @Column({
+        type: "text",
         nullable: true,
         comment: "สาขาวิชา/ทาง",
-        length: 255,
+        default: null
-        default: null,
     })
     fields: string;
 }

src/entities/RegistryEmployee.ts

@@ -248,9 +248,9 @@ export class RegistryEmployee extends EntityBase {
     birthdate: Date;
 
     @Column({
+        type: "text",
         nullable: true,
         comment: "วุฒิการศึกษา",
-        length: 255,
         default: null,
     })
     degrees: string;
@@ -313,18 +313,18 @@ export class RegistryEmployee extends EntityBase {
     Educations: string;
 
     @Column({
+        type: "text",
         nullable: true,
         comment: "ระดับศึกษา",
-        length: 255,
+        default: null
-        default: null,
     })
     educationLevels: string;
 
     @Column({
+        type: "text",
         nullable: true,
         comment: "สาขาวิชา/ทาง",
-        length: 255,
+        default: null
-        default: null,
     })
     fields: string;
 

src/migration/1757484721787-update_dataType_fields_registry_and_registryEmpployee.ts

@@ -0,0 +1,36 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class UpdateDataTypeFieldsRegistryAndRegistryEmpployee1757484721787 implements MigrationInterface {
+    name = 'UpdateDataTypeFieldsRegistryAndRegistryEmpployee1757484721787'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`registry\` DROP COLUMN \`degrees\``);
+        await queryRunner.query(`ALTER TABLE \`registry\` ADD \`degrees\` text NULL COMMENT 'วุฒิการศึกษา'`);
+        await queryRunner.query(`ALTER TABLE \`registry\` DROP COLUMN \`educationLevels\``);
+        await queryRunner.query(`ALTER TABLE \`registry\` ADD \`educationLevels\` text NULL COMMENT 'ระดับศึกษา'`);
+        await queryRunner.query(`ALTER TABLE \`registry\` DROP COLUMN \`fields\``);
+        await queryRunner.query(`ALTER TABLE \`registry\` ADD \`fields\` text NULL COMMENT 'สาขาวิชา/ทาง'`);
+        await queryRunner.query(`ALTER TABLE \`registryEmployee\` DROP COLUMN \`degrees\``);
+        await queryRunner.query(`ALTER TABLE \`registryEmployee\` ADD \`degrees\` text NULL COMMENT 'วุฒิการศึกษา'`);
+        await queryRunner.query(`ALTER TABLE \`registryEmployee\` DROP COLUMN \`educationLevels\``);
+        await queryRunner.query(`ALTER TABLE \`registryEmployee\` ADD \`educationLevels\` text NULL COMMENT 'ระดับศึกษา'`);
+        await queryRunner.query(`ALTER TABLE \`registryEmployee\` DROP COLUMN \`fields\``);
+        await queryRunner.query(`ALTER TABLE \`registryEmployee\` ADD \`fields\` text NULL COMMENT 'สาขาวิชา/ทาง'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`registryEmployee\` DROP COLUMN \`fields\``);
+        await queryRunner.query(`ALTER TABLE \`registryEmployee\` ADD \`fields\` varchar(255) NULL COMMENT 'สาขาวิชา/ทาง'`);
+        await queryRunner.query(`ALTER TABLE \`registryEmployee\` DROP COLUMN \`educationLevels\``);
+        await queryRunner.query(`ALTER TABLE \`registryEmployee\` ADD \`educationLevels\` varchar(255) NULL COMMENT 'ระดับศึกษา'`);
+        await queryRunner.query(`ALTER TABLE \`registryEmployee\` DROP COLUMN \`degrees\``);
+        await queryRunner.query(`ALTER TABLE \`registryEmployee\` ADD \`degrees\` varchar(255) NULL COMMENT 'วุฒิการศึกษา'`);
+        await queryRunner.query(`ALTER TABLE \`registry\` DROP COLUMN \`fields\``);
+        await queryRunner.query(`ALTER TABLE \`registry\` ADD \`fields\` varchar(255) NULL COMMENT 'สาขาวิชา/ทาง'`);
+        await queryRunner.query(`ALTER TABLE \`registry\` DROP COLUMN \`educationLevels\``);
+        await queryRunner.query(`ALTER TABLE \`registry\` ADD \`educationLevels\` varchar(255) NULL COMMENT 'ระดับศึกษา'`);
+        await queryRunner.query(`ALTER TABLE \`registry\` DROP COLUMN \`degrees\``);
+        await queryRunner.query(`ALTER TABLE \`registry\` ADD \`degrees\` varchar(255) NULL COMMENT 'วุฒิการศึกษา'`);
+    }
+
+}

src/services/PositionService.ts

@@ -5,11 +5,13 @@ import { PosMaster } from "../entities/PosMaster";
 import { PosMasterEmployeeHistory } from "../entities/PosMasterEmployeeHistory";
 import { PosMasterEmployeeTempHistory } from "../entities/PosMasterEmployeeTempHistory";
 import { PosMasterHistory } from "../entities/PosMasterHistory";
+import { ProfileEducation } from "../entities/ProfileEducation";
 import { RequestWithUser } from "../middlewares/user";
 
 export async function CreatePosMasterHistoryOfficer(
   posMasterId: string,
   request: RequestWithUser | null,
+  type?: string | null,
 ): Promise<boolean> {
   try {
     await AppDataSource.transaction(async (manager) => {
@@ -41,15 +43,17 @@ export async function CreatePosMasterHistoryOfficer(
           ? pm.positions.find((p) => p.positionIsSelected === true) ?? null
           : null;
       h.ancestorDNA = pm.ancestorDNA ? pm.ancestorDNA : _null;
+      if(!type || type != "DELETE"){
         h.prefix = pm.current_holder?.prefix || _null;
         h.firstName = pm.current_holder?.firstName || _null;
         h.lastName = pm.current_holder?.lastName || _null;
-      h.posMasterNoPrefix = pm.posMasterNoPrefix ?? _null;
-      h.posMasterNo = pm.posMasterNo ?? _null;
-      h.posMasterNoSuffix = pm.posMasterNoSuffix ?? _null;
         h.position = selectedPosition?.positionName ?? _null;
         h.posType = selectedPosition?.posType?.posTypeName ?? _null;
         h.posLevel = selectedPosition?.posLevel?.posLevelName ?? _null;
+      }
+      h.posMasterNoPrefix = pm.posMasterNoPrefix ?? _null;
+      h.posMasterNo = pm.posMasterNo ?? _null;
+      h.posMasterNoSuffix = pm.posMasterNoSuffix ?? _null;
       h.posExecutive = selectedPosition?.posExecutive?.posExecutiveName ?? _null;
       h.shortName =
         [
@@ -214,3 +218,22 @@ export async function CreatePosMasterHistoryEmployeeTemp(
     return false;
   }
 }
+
+export async function getTopDegrees(educations: ProfileEducation[]): Promise<string> {
+  // filter เฉพาะ isUse==true หรือ isEducation==true
+  const filtered = educations.filter((e) => e.isUse === true || e.isEducation === true);
+  // sort: isEducation==true ก่อน, ถ้าเท่ากัน sort ด้วย level น้อยสุด
+  const sorted = filtered.sort((a, b) => {
+    const aEdu = !!a.isEducation ? 0 : 1;
+    const bEdu = !!b.isEducation ? 0 : 1;
+    if (aEdu !== bEdu) return aEdu - bEdu;
+    const aLevel = typeof a.level === "number" ? a.level : Number.MAX_SAFE_INTEGER;
+    const bLevel = typeof b.level === "number" ? b.level : Number.MAX_SAFE_INTEGER;
+    return aLevel - bLevel;
+  });
+
+  return sorted
+    .map((e) => [e.degree, e.field].filter(Boolean).join(" "))
+    .filter(Boolean)
+    .join("\n");
+}

src/services/rabbitmq.ts

@@ -571,11 +571,11 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
         }
       }
       item.current_holderId = item.next_holderId;
-      item.conditionReason = _null;
+      // item.conditionReason = _null;
-      if (item.current_holderId) {
+      // if (item.current_holderId) {
-        item.conditionReason = _null;
+      //   item.conditionReason = _null;
-        item.isCondition = false;
+      //   item.isCondition = false;
-      }
+      // }
       item.next_holderId = null;
       item.lastUpdateUserId = lastUpdateUserId;
       item.lastUpdateFullName = lastUpdateFullName;
@@ -1760,10 +1760,10 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
               )
             ) {
               posMaster.next_holderId = item.current_holderId;
-              if (posMaster.next_holderId) {
+              // if (posMaster.next_holderId) {
-                posMaster.conditionReason = _null;
+              //   posMaster.conditionReason = _null;
-                posMaster.isCondition = false;
+              //   posMaster.isCondition = false;
-              }
+              // }
             } else {
               posMaster.next_holderId = null;
               posMaster.isSit = false;
@@ -1856,10 +1856,10 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
                 )
               ) {
                 posMaster.next_holderId = item.current_holderId;
-                if (posMaster.next_holderId) {
+                // if (posMaster.next_holderId) {
-                  posMaster.conditionReason = _null;
+                //   posMaster.conditionReason = _null;
-                  posMaster.isCondition = false;
+                //   posMaster.isCondition = false;
-                }
+                // }
               } else {
                 posMaster.next_holderId = null;
                 posMaster.isSit = false;
@@ -1954,10 +1954,10 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
                   )
                 ) {
                   posMaster.next_holderId = item.current_holderId;
-                  if (posMaster.next_holderId) {
+                  // if (posMaster.next_holderId) {
-                    posMaster.conditionReason = _null;
+                  //   posMaster.conditionReason = _null;
-                    posMaster.isCondition = false;
+                  //   posMaster.isCondition = false;
-                  }
+                  // }
                 } else {
                   posMaster.next_holderId = null;
                   posMaster.isSit = false;
@@ -2054,10 +2054,10 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
                     )
                   ) {
                     posMaster.next_holderId = item.current_holderId;
-                    if (posMaster.next_holderId) {
+                    // if (posMaster.next_holderId) {
-                      posMaster.conditionReason = _null;
+                    //   posMaster.conditionReason = _null;
-                      posMaster.isCondition = false;
+                    //   posMaster.isCondition = false;
-                    }
+                    // }
                   } else {
                     posMaster.next_holderId = null;
                     posMaster.isSit = false;
@@ -2157,10 +2157,10 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
                       )
                     ) {
                       posMaster.next_holderId = item.current_holderId;
-                      if (posMaster.next_holderId) {
+                      // if (posMaster.next_holderId) {
-                        posMaster.conditionReason = _null;
+                      //   posMaster.conditionReason = _null;
-                        posMaster.isCondition = false;
+                      //   posMaster.isCondition = false;
-                      }
+                      // }
                     } else {
                       posMaster.next_holderId = null;
                       posMaster.isSit = false;