Merge branch 'develop'

src/controllers/CommandController.ts

@@ -439,6 +439,7 @@ export class CommandController extends Controller {
           remarkVertical: x.remarkVertical,
           remarkHorizontal: x.remarkHorizontal,
           amount: x.amount,
+          amountSpecial: x.amountSpecial,
           positionSalaryAmount: x.positionSalaryAmount,
           mouthSalaryAmount: x.mouthSalaryAmount,
         })),
@@ -542,6 +543,7 @@ export class CommandController extends Controller {
       remarkVertical: string | null;
       remarkHorizontal: string | null;
       amount: Double | null;
+      amountSpecial: Double | null;
       positionSalaryAmount: Double | null;
       mouthSalaryAmount: Double | null;
     },
@@ -941,6 +943,7 @@ export class CommandController extends Controller {
     await new permission().PermissionGet(request, "COMMAND");
     const command = await this.commandRepository.findOne({
       where: { id },
+      relations: ["commandType"],
     });
     if (!command) {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลคำสั่งนี้");
@@ -953,6 +956,7 @@ export class CommandController extends Controller {
       isDraft: command.isDraft,
       isSign: command.isSign,
       isAttachment: command.isAttachment,
+      isSalary: command.commandType ? command.commandType.isSalary : null,
     };
     return new HttpSuccess(_command);
   }
@@ -1161,7 +1165,7 @@ export class CommandController extends Controller {
     await new permission().PermissionUpdate(request, "COMMAND");
     const command = await this.commandRepository.findOne({
       where: { id: id },
-     relations: ["commandType", "commandRecives",],
+      relations: ["commandType", "commandRecives"],
     });
     if (!command) {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลคำสั่งนี้");
@@ -1251,7 +1255,7 @@ export class CommandController extends Controller {
     let _data: any = null;
     await Promise.all([
       await new CallAPI()
-        .PostDataKeycloak("/realms/bma-ehr/protocol/openid-connect/token", data)
+        .PostDataKeycloak(`/realms/${process.env.KC_REALM}/protocol/openid-connect/token`, data)
         .then(async (x) => {
           _data = x;
         })
@@ -2261,16 +2265,22 @@ export class CommandController extends Controller {
             lastName: profile.lastName,
           });
           // กรณี Keycloak ไม่ถูกลบ ให้ลบซ้ำอีกรอบแล้วสร้างใหม่ และหากยังไม่สามารถลบได้ให้แสดง Error
-          if (profile.keycloak != null && userKeycloakId && userKeycloakId.errorMessage === "User exists with same username") {
+          if (
+            profile.keycloak != null &&
+            userKeycloakId &&
+            userKeycloakId.errorMessage === "User exists with same username"
+          ) {
             const delUserKeycloak = await deleteUser(profile.keycloak);
             if (delUserKeycloak) {
               userKeycloakId = await createUser(profile.citizenId, profile.citizenId, {
                 firstName: profile.firstName,
                 lastName: profile.lastName,
               });
-            }
+            } else {
-            else {
+              throw new HttpError(
-              throw new HttpError(HttpStatus.BAD_REQUEST, "พบข้อผิดพลาด ไม่สามารถจัดการผู้ใช้งานได้");
+                HttpStatus.BAD_REQUEST,
+                "พบข้อผิดพลาด ไม่สามารถจัดการผู้ใช้งานได้",
+              );
             }
           }
           const list = await getRoles();
@@ -3788,7 +3798,9 @@ export class CommandController extends Controller {
       if (
         orgRevision != null &&
         !["REPORT", "DONE"].includes(
-          orgRevision.posMasters.find((x) => x.statusReport === "REPORT" || x.statusReport === "DONE")?.statusReport || "",
+          orgRevision.posMasters.find(
+            (x) => x.statusReport === "REPORT" || x.statusReport === "DONE",
+          )?.statusReport || "",
         )
       ) {
         await this.orgRevisionRepo.update(orgRevision.id, {

src/controllers/DPISController.ts

@@ -26,25 +26,85 @@ interface DPISResponse {
 }
 
 interface DPISResult {
+  /**
+   * เลขประจำตัวประชาชน
+   */
   citizenId: string;
+  /**
+   * คำนำหน้า
+   */
   prefix: string;
+  /**
+   * ชื่อ
+   */
   firstName: string;
+  /**
+   * นามสกุล
+   */
   lastName: string;
+  /**
+   * เพศ
+   */
   gender: string;
+  /**
+   * สถานะ
+   */
   physicalStatus: string;
+  /**
+   * หน่วยงานคุณภาพ
+   */
   QualityWorkforce: boolean;
+  /**
+   * วันเกิด
+   */
   birthDate: DateTime;
+  /**
+   * วันบรรจุ
+   */
   dateAppoint: DateTime;
+  /**
+   * วันเริ่มปฏิบัติราชการ
+   */
   dateStart: DateTime;
+  /**
+   * วันที่เกษียณอายุราชการ
+   */
   dateRetire: DateTime;
+  /**
+   * พ้นจากราชการหรือไม่?
+   */
   isLeave: boolean;
+  /**
+   * พ้นจากการทดลองปฏิบัติราชการหรือไม่?
+   */
   isProbation: boolean;
+  /**
+   * สาเหตุการพ้นจากราชการ
+   */
   leaveReason: string;
+  /**
+   * ระดับ
+   */
   positionLevel: string;
+  /**
+   * ประเภท
+   */
   positionType: string;
+  /**
+   * ข้อมูลประวัติการศึกษา
+   */
   educations: ProfileEducationResult[];
+  /**
+   * ข้อมูลการลา
+   */
   leaves: ProfileLeaveResult[];
+  /**
+   * ข้อมูลเงินเดือน
+   */
   salaries: ProfileSalaryResult[];
+  /**
+   * ข้อมูลหน่วยงาน
+   */
   organization: ProfileOrgResult;
 }
 

src/controllers/LoginController.ts

@@ -37,7 +37,7 @@ export class LoginController extends Controller {
     let _data: any = null;
     await Promise.all([
       await new CallAPI()
-        .PostDataKeycloak("/realms/bma-ehr/protocol/openid-connect/token", data)
+        .PostDataKeycloak(`/realms/${process.env.KC_REALM}/protocol/openid-connect/token`, data)
         .then(async (x) => {
           _data = x;
         })

src/controllers/OrganizationController.ts

@@ -6372,7 +6372,9 @@ export class OrganizationController extends Controller {
                   orgRoot.orgRootCode +
                   orgChild1.orgChild1Code +
                   " " +
-                  orgChild1.orgChild1ShortName,
+                  orgChild1.orgChild1ShortName +
+                  "/" +
+                  orgRoot.orgRootName + " " + orgRoot.orgRootCode + "00" + " " + orgRoot.orgRootShortName,
                 totalPosition: await this.posMasterRepository.count({
                   where: { orgRevisionId: orgRoot.orgRevisionId, orgChild1Id: orgChild1.id },
                 }),
@@ -6487,7 +6489,16 @@ export class OrganizationController extends Controller {
                         orgRoot.orgRootCode +
                         orgChild2.orgChild2Code +
                         " " +
-                        orgChild2.orgChild2ShortName,
+                        orgChild2.orgChild2ShortName +
+                        "/" +
+                        orgChild1.orgChild1Name +
+                        " " +
+                        orgRoot.orgRootCode +
+                        orgChild1.orgChild1Code +
+                        " " +
+                        orgChild1.orgChild1ShortName +
+                        "/" +
+                        orgRoot.orgRootName + " " + orgRoot.orgRootCode + "00" + " " + orgRoot.orgRootShortName,
                       totalPosition: await this.posMasterRepository.count({
                         where: {
                           orgRevisionId: orgRoot.orgRevisionId,
@@ -6605,7 +6616,23 @@ export class OrganizationController extends Controller {
                             orgRoot.orgRootCode +
                             orgChild3.orgChild3Code +
                             " " +
-                              orgChild3.orgChild3ShortName,
+                            orgChild3.orgChild3ShortName +
+                            "/" +
+                            orgChild2.orgChild2Name +
+                            " " +
+                            orgRoot.orgRootCode +
+                            orgChild2.orgChild2Code +
+                            " " +
+                            orgChild2.orgChild2ShortName +
+                            "/" +
+                            orgChild1.orgChild1Name +
+                            " " +
+                            orgRoot.orgRootCode +
+                            orgChild1.orgChild1Code +
+                            " " +
+                            orgChild1.orgChild1ShortName +
+                            "/" +
+                            orgRoot.orgRootName + " " + orgRoot.orgRootCode + "00" + " " + orgRoot.orgRootShortName,
                             totalPosition: await this.posMasterRepository.count({
                               where: {
                                 orgRevisionId: orgRoot.orgRevisionId,
@@ -6723,7 +6750,30 @@ export class OrganizationController extends Controller {
                                     orgRoot.orgRootCode +
                                     orgChild4.orgChild4Code +
                                     " " +
-                                    orgChild4.orgChild4ShortName,
+                                    orgChild4.orgChild4ShortName +
+                                    "/" +
+                                    orgChild3.orgChild3Name +
+                                    " " +
+                                    orgRoot.orgRootCode +
+                                    orgChild3.orgChild3Code +
+                                    " " +
+                                    orgChild3.orgChild3ShortName +
+                                    "/" +
+                                    orgChild2.orgChild2Name +
+                                    " " +
+                                    orgRoot.orgRootCode +
+                                    orgChild2.orgChild2Code +
+                                    " " +
+                                    orgChild2.orgChild2ShortName +
+                                    "/" +
+                                    orgChild1.orgChild1Name +
+                                    " " +
+                                    orgRoot.orgRootCode +
+                                    orgChild1.orgChild1Code +
+                                    " " +
+                                    orgChild1.orgChild1ShortName +
+                                    "/" +
+                                    orgRoot.orgRootName + " " + orgRoot.orgRootCode + "00" + " " + orgRoot.orgRootShortName,
                                   totalPosition: await this.posMasterRepository.count({
                                     where: {
                                       orgRevisionId: orgRoot.orgRevisionId,

src/controllers/OrganizationDotnetController.ts

@@ -2619,6 +2619,266 @@ export class OrganizationDotnetController extends Controller {
     return new HttpSuccess(profile_);
   }
 
+  /**
+   * 5.	เอารายชื่อคนที่มีการ ,map keycloak id แล้ว
+   *
+   * @summary 5. เอารายชื่อคนที่มีการ ,map keycloak id แล้ว
+   *
+   */
+  @Get("keycloak-employee")
+  async GetProfileWithKeycloakEmployee() {
+    const profile = await this.profileEmpRepo.find({
+      where: { keycloak: Not(IsNull()) || Not("") },
+      relations: [
+        "posType",
+        "posLevel",
+        "current_holders",
+        "current_holders.orgRoot",
+        "current_holders.orgChild1",
+        "current_holders.orgChild2",
+        "current_holders.orgChild3",
+        "current_holders.orgChild4",
+        "profileSalary",
+      ],
+      order: {
+        profileSalary: {
+          order: "DESC",
+        },
+      },
+    });
+
+    const findRevision = await this.orgRevisionRepo.findOne({
+      where: { orgRevisionIsCurrent: true },
+    });
+
+    const profile_ = await Promise.all(
+      profile.map((item: ProfileEmployee) => {
+        const rootName =
+          item.current_holders.length == 0
+            ? null
+            : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot
+                ?.orgRootName;
+        const shortName =
+          item.current_holders.length == 0
+            ? null
+            : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
+                  null
+              ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4.orgChild4ShortName}${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+              : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                    ?.orgChild3 != null
+                ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild3.orgChild3ShortName}${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                      ?.orgChild2 != null
+                  ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild2.orgChild2ShortName}${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                  : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                        ?.orgChild1 != null
+                    ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild1.orgChild1ShortName}${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                    : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
+                          null &&
+                        item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                          ?.orgRoot != null
+                      ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot.orgRootShortName}${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                      : null;
+
+        return {
+          oc: rootName,
+          id: item.id,
+          createdAt: item.createdAt,
+          createdUserId: item.createdUserId,
+          lastUpdatedAt: item.lastUpdatedAt,
+          lastUpdateUserId: item.lastUpdateUserId,
+          createdFullName: item.createdFullName,
+          lastUpdateFullName: item.lastUpdateFullName,
+          avatar: item.avatar,
+          avatarName: item.avatarName,
+          rank: item.rank,
+          prefix: item.prefix,
+          firstName: item.firstName,
+          lastName: item.lastName,
+          citizenId: item.citizenId,
+          position: item.position,
+          posLevelId: item.posLevelId,
+          posTypeId: item.posTypeId,
+          email: item.email,
+          phone: item.phone,
+          keycloak: item.keycloak,
+          isProbation: item.isProbation,
+          isLeave: item.isLeave,
+          leaveReason: item.leaveReason,
+          dateLeave: item.dateLeave,
+          dateRetire: item.dateRetire,
+          dateAppoint: item.dateAppoint,
+          dateRetireLaw: item.dateRetireLaw,
+          dateStart: item.dateStart,
+          govAgeAbsent: item.govAgeAbsent,
+          govAgePlus: item.govAgePlus,
+          birthDate: item.birthDate ?? new Date(),
+          reasonSameDate: item.reasonSameDate,
+          ethnicity: item.ethnicity,
+          telephoneNumber: item.telephoneNumber,
+          nationality: item.nationality,
+          gender: item.gender,
+          relationship: item.relationship,
+          religion: item.religion,
+          bloodGroup: item.bloodGroup,
+          registrationAddress: item.registrationAddress,
+          registrationProvinceId: item.registrationProvinceId,
+          registrationDistrictId: item.registrationDistrictId,
+          registrationSubDistrictId: item.registrationSubDistrictId,
+          registrationZipCode: item.registrationZipCode,
+          currentAddress: item.currentAddress,
+          currentProvinceId: item.currentProvinceId,
+          currentDistrictId: item.currentDistrictId,
+          currentSubDistrictId: item.currentSubDistrictId,
+          currentZipCode: item.currentZipCode,
+          dutyTimeId: item.dutyTimeId,
+          dutyTimeEffectiveDate: item.dutyTimeEffectiveDate,
+          positionLevel: item.profileSalary.length > 0 ? item.profileSalary[0].positionLevel : null,
+          posNo: shortName,
+        };
+      }),
+    );
+
+    return new HttpSuccess(profile_);
+  }
+
+  /**
+   * 5.	เอารายชื่อคนที่มีการ ,map keycloak id แล้ว
+   *
+   * @summary 5. เอารายชื่อคนที่มีการ ,map keycloak id แล้ว
+   *
+   */
+  @Get("keycloak-all-officer")
+  async GetProfileWithKeycloakAllOfficer() {
+    const profile = await this.profileRepo.find({
+      where: { keycloak: Not(IsNull()) || Not(""), isLeave: false },
+      relations: [
+        "current_holders",
+        "current_holders.orgRoot",
+        "current_holders.orgChild1",
+        "current_holders.orgChild2",
+        "current_holders.orgChild3",
+        "current_holders.orgChild4",
+      ],
+    });
+
+    const findRevision = await this.orgRevisionRepo.findOne({
+      where: { orgRevisionIsCurrent: true },
+    });
+
+    const profile_ = await Promise.all(
+      profile.map((item: Profile) => {
+        const shortName =
+          item.current_holders.length == 0
+            ? null
+            : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
+                  null
+              ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4.orgChild4ShortName}${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+              : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                    ?.orgChild3 != null
+                ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild3.orgChild3ShortName}${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                      ?.orgChild2 != null
+                  ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild2.orgChild2ShortName}${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                  : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                        ?.orgChild1 != null
+                    ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild1.orgChild1ShortName}${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                    : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
+                          null &&
+                        item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                          ?.orgRoot != null
+                      ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot.orgRootShortName}${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                      : null;
+
+        return {
+          id: item.id,
+          prefix: item.prefix,
+          firstName: item.firstName,
+          lastName: item.lastName,
+          keycloak: item.keycloak,
+          posNo: shortName,
+        };
+      }),
+    );
+
+    return new HttpSuccess(profile_);
+  }
+
+  /**
+   * 5.	เอารายชื่อคนที่มีการ ,map keycloak id แล้ว
+   *
+   * @summary 5. เอารายชื่อคนที่มีการ ,map keycloak id แล้ว
+   *
+   */
+  @Get("keycloak-all-employee")
+  async GetProfileWithKeycloakAllEmployee() {
+    const profile = await this.profileEmpRepo.find({
+      where: { keycloak: Not(IsNull()) || Not(""), isLeave: false },
+      relations: [
+        "current_holders",
+        "current_holders.orgRoot",
+        "current_holders.orgChild1",
+        "current_holders.orgChild2",
+        "current_holders.orgChild3",
+        "current_holders.orgChild4",
+      ],
+    });
+
+    const findRevision = await this.orgRevisionRepo.findOne({
+      where: { orgRevisionIsCurrent: true },
+    });
+
+    const profile_ = await Promise.all(
+      profile.map((item: ProfileEmployee) => {
+        const shortName =
+          item.current_holders.length == 0
+            ? null
+            : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
+                  null
+              ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4.orgChild4ShortName}${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+              : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                    ?.orgChild3 != null
+                ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild3.orgChild3ShortName}${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                      ?.orgChild2 != null
+                  ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild2.orgChild2ShortName}${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                  : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                        ?.orgChild1 != null
+                    ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild1.orgChild1ShortName}${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                    : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
+                          null &&
+                        item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                          ?.orgRoot != null
+                      ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot.orgRootShortName}${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                      : null;
+
+        return {
+          id: item.id,
+          prefix: item.prefix,
+          firstName: item.firstName,
+          lastName: item.lastName,
+          citizenId: item.citizenId,
+          keycloak: item.keycloak,
+          posNo: shortName,
+        };
+      }),
+    );
+
+    return new HttpSuccess(profile_);
+  }
+
   /**
    * 4.	API Update รอบการลงเวลา ในตาราง profile
    *

src/controllers/PositionController.ts

@@ -4953,6 +4953,7 @@ export class PositionController extends Controller {
           (masterId.length > 0
             ? { id: In(masterId) }
             : { posMasterNo: Like(`%${body.keyword}%`) })),
+        current_holderId: IsNull(),
       },
     ];
     let [posMaster, total] = await AppDataSource.getRepository(PosMaster)
@@ -4962,11 +4963,14 @@ export class PositionController extends Controller {
       .leftJoinAndSelect("posMaster.orgChild2", "orgChild2")
       .leftJoinAndSelect("posMaster.orgChild3", "orgChild3")
       .leftJoinAndSelect("posMaster.orgChild4", "orgChild4")
+      .leftJoinAndSelect("posMaster.orgRevision", "orgRevision")
+      .leftJoinAndSelect("posMaster.current_holder", "current_holder")
+      .leftJoinAndSelect("current_holder.posType", "posType")
+      .leftJoinAndSelect("current_holder.posLevel", "posLevel")
       .where(conditions)
-      .andWhere({
+      .orWhere(
-        current_holderId: IsNull(),
+        new Brackets((qb) => {
-      })
+          qb.andWhere(
-      .andWhere(
             _data.root != undefined && _data.root != null
               ? _data.root[0] != null
                 ? `posMaster.orgRootId IN (:...root)`
@@ -4976,7 +4980,12 @@ export class PositionController extends Controller {
               root: _data.root,
             },
           )
-      .andWhere(
+          .andWhere(conditions)
+        }),
+      )
+      .orWhere(
+        new Brackets((qb) => {
+          qb.andWhere(
             _data.child1 != undefined && _data.child1 != null
               ? _data.child1[0] != null
                 ? `posMaster.orgChild1Id IN (:...child1)`
@@ -4986,7 +4995,12 @@ export class PositionController extends Controller {
               child1: _data.child1,
             },
           )
-      .andWhere(
+          .andWhere(conditions)
+        }),
+      )
+      .orWhere(
+        new Brackets((qb) => {
+          qb.andWhere(
             _data.child2 != undefined && _data.child2 != null
               ? _data.child2[0] != null
                 ? `posMaster.orgChild2Id IN (:...child2)`
@@ -4996,7 +5010,12 @@ export class PositionController extends Controller {
               child2: _data.child2,
             },
           )
-      .andWhere(
+          .andWhere(conditions)
+        }),
+      )
+      .orWhere(
+        new Brackets((qb) => {
+          qb.andWhere(
             _data.child3 != undefined && _data.child3 != null
               ? _data.child3[0] != null
                 ? `posMaster.orgChild3Id IN (:...child3)`
@@ -5006,7 +5025,12 @@ export class PositionController extends Controller {
               child3: _data.child3,
             },
           )
-      .andWhere(
+          .andWhere(conditions)
+        }),
+      )
+      .orWhere(
+        new Brackets((qb) => {
+          qb.andWhere(
             _data.child4 != undefined && _data.child4 != null
               ? _data.child4[0] != null
                 ? `posMaster.orgChild4Id IN (:...child4)`
@@ -5016,13 +5040,60 @@ export class PositionController extends Controller {
               child4: _data.child4,
             },
           )
-      .andWhere(
+          .andWhere(conditions)
+        }),
+      )
+      .orWhere(
+        new Brackets((qb) => {
+          qb.andWhere(
+            body.keyword != null && body.keyword != ""
+              ? `current_holder.posType LIKE :keyword`
+              : "1=1",
+            {
+              keyword: `%${body.keyword}%`,
+            },
+          )
+          .andWhere(conditions)
+        }),
+      )
+      .orWhere(
+        new Brackets((qb) => {
+          qb.andWhere(
+            body.keyword != null && body.keyword != ""
+              ? `current_holder.posLevel LIKE :keyword`
+              : "1=1",
+            {
+              keyword: `%${body.keyword}%`,
+            },
+          )
+          .andWhere(conditions)
+        }),
+      )
+      .orWhere(
+        new Brackets((qb) => {
+          qb.andWhere(
+            body.keyword != null && body.keyword != ""
+              ? `current_holder.position LIKE :keyword`
+              : "1=1",
+            {
+              keyword: `%${body.keyword}%`,
+            },
+          )
+          .andWhere(conditions)
+        }),
+      )
+      .orWhere(
+        new Brackets((qb) => {
+          qb.andWhere(
             body.keyword != null && body.keyword != ""
               ? body.isAll == false
                 ? searchShortName
                 : `CASE WHEN posMaster.orgChild1 is null THEN ${searchShortName0} WHEN posMaster.orgChild2 is null THEN ${searchShortName1} WHEN posMaster.orgChild3 is null THEN ${searchShortName2} WHEN posMaster.orgChild4 is null THEN ${searchShortName3} ELSE ${searchShortName4} END LIKE '%${body.keyword}%'`
               : "1=1",
           )
+          .andWhere(conditions)
+        }),
+      )
       .orderBy("posMaster.posMasterOrder", "ASC")
       .skip((body.page - 1) * body.pageSize)
       .take(body.pageSize)

src/controllers/ProfileController.ts

@@ -278,7 +278,7 @@ export class ProfileController extends Controller {
           : "-",
       ocFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`,
       educations: Education,
-      url: ImgUrl ? ImgUrl : `https://bma-ehr.frappet.synology.me/assets/avatar_user-89f22423.jpg`,
+      url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_SSO}/assets/avatar_user-89f22423.jpg`,
     };
 
     return new HttpSuccess({
@@ -715,7 +715,7 @@ export class ProfileController extends Controller {
           : "",
       telephone:
         profiles.telephoneNumber != null ? Extension.ToThaiNumber(profiles.telephoneNumber) : "",
-      url: ImgUrl ? ImgUrl : `https://bma-ehr.frappet.synology.me/assets/avatar_user-89f22423.jpg`,
+      url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_SSO}/assets/avatar_user-89f22423.jpg`,
       url1: _ImgUrl[0] ? _ImgUrl[0] : null,
       yearUpload1: profiles.profileAvatars[0]
         ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[0].createdAt))
@@ -4248,8 +4248,8 @@ export class ProfileController extends Controller {
             {
               keyword: `%${searchKeyword}%`,
             },
-          )
+          );
-        })
+        }),
       )
       .orderBy("current_holders.posMasterNo", "ASC")
       .skip((page - 1) * pageSize)
@@ -6030,8 +6030,8 @@ export class ProfileController extends Controller {
           where: {
             citizenId: Like(`%${body.keyword}%`),
             current_holders: {
-              orgRevisionId:revision?.id
+              orgRevisionId: revision?.id,
-            }
+            },
           },
           relations: [
             "posType",
@@ -6050,7 +6050,8 @@ export class ProfileController extends Controller {
         break;
 
       case "fullName":
-        [findProfile, total] = await this.profileRepo.createQueryBuilder("profile")
+        [findProfile, total] = await this.profileRepo
+          .createQueryBuilder("profile")
           .leftJoinAndSelect("profile.posType", "posType")
           .leftJoinAndSelect("profile.posLevel", "posLevel")
           .leftJoinAndSelect("profile.current_holders", "current_holders")
@@ -6060,7 +6061,10 @@ export class ProfileController extends Controller {
           .leftJoinAndSelect("current_holders.orgChild3", "orgChild3")
           .leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
           .where("current_holders.orgRevision = :revisionId", { revisionId: revision?.id })
-        .andWhere("CONCAT(profile.prefix, profile.firstName, ' ', profile.lastName) LIKE :keyword", { keyword: `%${body.keyword}%` })
+          .andWhere(
+            "CONCAT(profile.prefix, profile.firstName, ' ', profile.lastName) LIKE :keyword",
+            { keyword: `%${body.keyword}%` },
+          )
           .skip(skip)
           .take(take)
           .getManyAndCount();
@@ -6071,8 +6075,8 @@ export class ProfileController extends Controller {
           where: {
             position: Like(`%${body.keyword}%`),
             current_holders: {
-              orgRevisionId:revision?.id
+              orgRevisionId: revision?.id,
-            } 
+            },
           },
           relations: [
             "posType",
@@ -6091,7 +6095,8 @@ export class ProfileController extends Controller {
         break;
 
       case "posNo":
-        [findProfile, total] = await this.profileRepo.createQueryBuilder("profile")
+        [findProfile, total] = await this.profileRepo
+          .createQueryBuilder("profile")
           .leftJoinAndSelect("profile.posType", "posType")
           .leftJoinAndSelect("profile.posLevel", "posLevel")
           .leftJoinAndSelect("profile.current_holders", "current_holders")
@@ -6103,13 +6108,15 @@ export class ProfileController extends Controller {
           .where("current_holders.orgRevision = :revisionId", { revisionId: revision?.id })
           .andWhere(
             new Brackets((qb) => {
-              qb.orWhere(body.keyword != undefined && body.keyword != null && body.keyword != ""
+              qb.orWhere(
+                body.keyword != undefined && body.keyword != null && body.keyword != ""
                   ? queryLike
                   : "1=1",
                 {
                   keyword: `%${body.keyword}%`,
-              })
+                },
-            })
+              );
+            }),
           )
           .skip(skip)
           .take(take)
@@ -6120,11 +6127,11 @@ export class ProfileController extends Controller {
         [findProfile, total] = await this.profileRepo.findAndCount({
           where: {
             posType: {
-              posTypeName:Like(`%${body.keyword}%`)
+              posTypeName: Like(`%${body.keyword}%`),
             },
             current_holders: {
-              orgRevisionId:revision?.id
+              orgRevisionId: revision?.id,
-            } 
+            },
           },
           relations: [
             "posType",
@@ -6146,11 +6153,11 @@ export class ProfileController extends Controller {
         [findProfile, total] = await this.profileRepo.findAndCount({
           where: {
             posLevel: {
-              posLevelName:Like(`%${body.keyword}%`)
+              posLevelName: Like(`%${body.keyword}%`),
             },
             current_holders: {
-              orgRevisionId:revision?.id
+              orgRevisionId: revision?.id,
-            } 
+            },
           },
           relations: [
             "posType",
@@ -6174,9 +6181,10 @@ export class ProfileController extends Controller {
             current_holders: {
               orgRevisionId: revision?.id,
               orgRoot: {
-              orgRootName:Like(`%${body.keyword}%`)
+                orgRootName: Like(`%${body.keyword}%`),
-            }
+              },
-          }},
+            },
+          },
           relations: [
             "posType",
             "posLevel",
@@ -6197,8 +6205,8 @@ export class ProfileController extends Controller {
         [findProfile, total] = await this.profileRepo.findAndCount({
           where: {
             current_holders: {
-              orgRevisionId:revision?.id
+              orgRevisionId: revision?.id,
-            }
+            },
           },
           relations: [
             "posType",

src/controllers/ProfileEmployeeController.ts

@@ -284,7 +284,7 @@ export class ProfileEmployeeController extends Controller {
           : "-",
       ocFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`,
       educations: Education,
-      url: ImgUrl ? ImgUrl : `https://bma-ehr.frappet.synology.me/assets/avatar_user-89f22423.jpg`,
+      url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_SSO}/assets/avatar_user-89f22423.jpg`,
     };
 
     return new HttpSuccess({
@@ -722,7 +722,7 @@ export class ProfileEmployeeController extends Controller {
           : "",
       telephone:
         profiles.telephoneNumber != null ? Extension.ToThaiNumber(profiles.telephoneNumber) : "",
-      url: ImgUrl ? ImgUrl : `https://bma-ehr.frappet.synology.me/assets/avatar_user-89f22423.jpg`,
+      url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_SSO}/assets/avatar_user-89f22423.jpg`,
       url1: _ImgUrl[0] ? _ImgUrl[0] : null,
       yearUpload1: profiles.profileAvatars[0]
         ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[0].createdAt))

src/controllers/ProfileEmployeeTempController.ts

@@ -281,7 +281,7 @@ export class ProfileEmployeeTempController extends Controller {
           : "-",
       ocFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`,
       educations: Education,
-      url: ImgUrl ? ImgUrl : `https://bma-ehr.frappet.synology.me/assets/avatar_user-89f22423.jpg`,
+      url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_SSO}/assets/avatar_user-89f22423.jpg`,
     };
 
     return new HttpSuccess({
@@ -719,7 +719,7 @@ export class ProfileEmployeeTempController extends Controller {
           : "",
       telephone:
         profiles.telephoneNumber != null ? Extension.ToThaiNumber(profiles.telephoneNumber) : "",
-      url: ImgUrl ? ImgUrl : `https://bma-ehr.frappet.synology.me/assets/avatar_user-89f22423.jpg`,
+      url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_SSO}/assets/avatar_user-89f22423.jpg`,
       url1: _ImgUrl[0] ? _ImgUrl[0] : null,
       yearUpload1: profiles.profileAvatars[0]
         ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[0].createdAt))

src/controllers/ReportController.ts

@@ -1,4 +1,4 @@
-import { Controller, Get, Route, Security, Tags, SuccessResponse, Response, Path } from "tsoa";
+import { Controller, Get, Route, Security, Tags, SuccessResponse, Response, Path, Query } from "tsoa";
 import { AppDataSource } from "../database/data-source";
 import HttpSuccess from "../interfaces/http-success";
 import HttpStatusCode from "../interfaces/http-status";
@@ -17,6 +17,7 @@ import { EmployeePosMaster } from "../entities/EmployeePosMaster";
 import Extension from "../interfaces/extension";
 import { LeaveType } from "../entities/LeaveType";
 import HttpStatus from "../interfaces/http-status";
+import { Profile } from "../entities/Profile";
 @Route("api/v1/org/report")
 @Tags("Report")
 @Security("bearerAuth")
@@ -34,7 +35,207 @@ export class ReportController extends Controller {
   private posTypepository = AppDataSource.getRepository(PosType);
   private posLevelRepository = AppDataSource.getRepository(PosLevel);
   private posMasterRepository = AppDataSource.getRepository(PosMaster);
+  private profileRepository = AppDataSource.getRepository(Profile);
   private empPosMasterRepository = AppDataSource.getRepository(EmployeePosMaster);
+   /**
+   * API รายงานสถิติข้อมูลข้าราชการ กทม. สามัญ
+   *
+   * @summary รายงานสถิติข้อมูลข้าราชการ กทม. สามัญ
+   *
+   */
+  @Get("registry-officer")
+  async registryOfficer(
+    @Query() rootId: string,
+    @Query() year?: number,
+    @Query() ageMin?: number,
+    @Query() ageMax?: number,
+  ) {
+    if (ageMin && (ageMin < 20 || ageMin > 80)) {
+      throw new HttpError(HttpStatus.BAD_REQUEST, "ageMin must be between 20 and 80");
+    }
+
+    if (ageMax && (ageMax < 20 || ageMax > 80)) {
+      throw new HttpError(HttpStatus.BAD_REQUEST, "ageMax must be between 20 and 80");
+    }
+
+    const minAge = ageMin ?? 20;
+    const maxAge = ageMax ?? 80;
+  
+    if (minAge > maxAge) {
+      throw new HttpError(HttpStatus.NOT_FOUND, "ageMin cannot be greater than ageMax");
+    }
+    const yearInAD = year?year - 543:null;
+    const currentRevision = await this.orgRevisionRepository.findOne({
+      where:{
+        orgRevisionIsCurrent: true
+      }
+    });
+    const rawdataProfile = await this.posMasterRepository
+    .createQueryBuilder('posMaster')
+    .leftJoinAndSelect('posMaster.current_holder', 'current_holder') 
+    .leftJoinAndSelect('posMaster.positions', 'positions') 
+    .leftJoinAndSelect('posMaster.orgRoot', 'orgRoot') 
+    .leftJoinAndSelect('positions.posExecutive', 'posExecutive') 
+    .leftJoinAndSelect('current_holder.posType', 'posType') 
+    .leftJoinAndSelect('current_holder.posLevel', 'posLevel') 
+    .leftJoinAndSelect('current_holder.profileEducations', 'profileEducations')
+    .where('posMaster.orgRevisionId = :currentRevisionId', { currentRevisionId: currentRevision?.id })
+    .andWhere('posMaster.orgRootId = :rootId', { rootId })
+    .andWhere('posMaster.current_holderId Is Not Null')
+    .andWhere('positions.positionIsSelected = :positionIsSelected', { positionIsSelected: true })
+    .andWhere( yearInAD && yearInAD != null? 'YEAR(current_holder.dateAppoint) = :year': "1=1", { year: yearInAD })
+    .andWhere(`
+      TIMESTAMPDIFF(YEAR, current_holder.birthDate, CURDATE()) >= :minAge
+      AND TIMESTAMPDIFF(YEAR, current_holder.birthDate, CURDATE()) <= :maxAge
+    `, { minAge, maxAge })
+    .orderBy("posType.posTypeaName","ASC")
+    .getMany();
+    if(!rawdataProfile){
+      throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลบุคคลนี้ในระบบ");
+    }
+    const mapData = rawdataProfile
+    .map((x) => {
+      const latestEducation = x.current_holder.profileEducations.sort((a:any, b:any) => b.endDate - a.startDate)[0];
+      return {
+        name: x.current_holder.firstName + " " + x.current_holder.lastName,
+        affiliation: x.orgRoot.orgRootName,
+        gender: x.current_holder.gender,
+        positionName: x.positions[0]?x.positions[0].positionName:"-",
+        status: x.current_holder.relationship,
+        posType: x.current_holder.posType.posTypeName,
+        posLevel: x.current_holder.posLevel.posLevelName,
+        degree: latestEducation ? latestEducation.educationLevel : "-",
+        posExecutive: x.positions[0].posExecutive?x.positions[0].posExecutive.posExecutiveName:"-",
+        currentPreiodPos: "-",
+        levelPeriodPos: "-",
+      };
+    });
+
+    const groupedData = mapData.reduce((acc:any, item) => {
+      const key = `${item.posType} - ${item.affiliation} - ${item.gender} - ${item.degree || 'ไม่พบข้อมูล'} - ${item.status || 'ไม่พบข้อมูล'} - ${item.positionName} - ${item.posLevel} - ${item.posExecutive || 'ไม่พบข้อมูล'} `;
+      if (!acc[key]) {
+        acc[key] = {
+          posType: item.posType,
+          affiliation: item.affiliation,
+          gender: item.gender,
+          degree: item.degree,
+          status: item.status,
+          positionName: item.positionName,
+          posLevel: item.posLevel,
+          posExecutive: item.posExecutive,
+          currentPreiodPos: "-",
+          levelPeriodPos: "-",
+          count: 0,
+        };
+      }
+      acc[key].count++;
+
+      return acc;
+    }, {});
+    
+    return new HttpSuccess({
+      template: "registry-officer",
+      reportName: "xlsx-report",
+      data: groupedData,
+    });
+  }
+   /**
+   * API รายงานสถิติข้อมูลลูกจ้างประจำ กทม.
+   *
+   * @summary รายงานสถิติข้อมูลลูกจ้างประจำ กทม.
+   *
+   */
+  @Get("registry-emp")
+  async registryEmp(
+    @Query() rootId: string,
+    @Query() year?: number,
+    @Query() ageMin?: number,
+    @Query() ageMax?: number,
+  ) {
+    if (ageMin && (ageMin < 20 || ageMin > 80)) {
+      throw new HttpError(HttpStatus.BAD_REQUEST, "ageMin must be between 20 and 80");
+    }
+
+    if (ageMax && (ageMax < 20 || ageMax > 80)) {
+      throw new HttpError(HttpStatus.BAD_REQUEST, "ageMax must be between 20 and 80");
+    }
+
+    const minAge = ageMin ?? 20;
+    const maxAge = ageMax ?? 80;
+  
+    if (minAge > maxAge) {
+      throw new HttpError(HttpStatus.NOT_FOUND, "ageMin cannot be greater than ageMax");
+    }
+    const yearInAD = year?year - 543:null;
+    const currentRevision = await this.orgRevisionRepository.findOne({
+      where:{
+        orgRevisionIsCurrent: true
+      }
+    });
+    const rawdataProfile = await this.empPosMasterRepository
+    .createQueryBuilder('posMaster')
+    .leftJoinAndSelect('posMaster.current_holder', 'current_holder') 
+    .leftJoinAndSelect('posMaster.positions', 'positions') 
+    .leftJoinAndSelect('posMaster.orgRoot', 'orgRoot') 
+    .leftJoinAndSelect('current_holder.posType', 'posType') 
+    .leftJoinAndSelect('current_holder.posLevel', 'posLevel') 
+    .leftJoinAndSelect('current_holder.profileEducations', 'profileEducations')
+    .where('posMaster.orgRevisionId = :currentRevisionId', { currentRevisionId: currentRevision?.id })
+    .andWhere('posMaster.orgRootId = :rootId', { rootId })
+    .andWhere('posMaster.current_holderId Is Not Null')
+    .andWhere('positions.positionIsSelected = :positionIsSelected', { positionIsSelected: true })
+    .andWhere( yearInAD && yearInAD != null? 'YEAR(current_holder.dateAppoint) = :year': "1=1", { year: yearInAD })
+      .andWhere(`
+      TIMESTAMPDIFF(YEAR, current_holder.birthDate, CURDATE()) >= :minAge
+      AND TIMESTAMPDIFF(YEAR, current_holder.birthDate, CURDATE()) <= :maxAge
+    `, { minAge, maxAge })
+    .getMany();
+    if(!rawdataProfile){
+      throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลบุคคลนี้ในระบบ");
+    }
+    const mapData = rawdataProfile.map((x) => {
+      const latestEducation = x.current_holder.profileEducations.sort((a:any, b:any) => b.endDate - a.startDate)[0];
+      return {
+        name: x.current_holder.firstName + " " + x.current_holder.lastName,
+        affiliation: x.orgRoot.orgRootName,
+        gender: x.current_holder.gender,
+        positionName: x.positions[0]?x.positions[0].positionName: "-",
+        status: x.current_holder.relationship,
+        posType: x.current_holder.posType.posTypeName,
+        posLevel: x.current_holder.posLevel.posLevelName,
+        degree: latestEducation ? latestEducation.educationLevel :  "-",
+        period: "-",
+      };
+    });
+
+    const groupedData = mapData.reduce((acc:any, item) => {
+      const key = `${item.affiliation} - ${item.gender} - ${item.degree || 'ไม่พบข้อมูล'} - ${item.status || 'ไม่พบข้อมูล'} - ${item.posType} -  ${item.positionName} - ${item.posLevel} 
+      `;
+      if (!acc[key]) {
+        acc[key] = {
+          affiliation: item.affiliation,
+          gender: item.gender,
+          degree: item.degree,
+          status: item.status,
+          posType: item.posType,
+          positionName: item.positionName,
+          posLevel: item.posLevel,
+          period: "-",
+          count: 0,
+        };
+      }
+      acc[key].count++;
+
+      return acc;
+    }, {});
+    
+    return new HttpSuccess({
+      template: "registry-emp",
+      reportName: "xlsx-report",
+      data: groupedData,
+    });
+
+  }
 
   /**
    * API Report1
@@ -6471,4 +6672,5 @@ export class ReportController extends Controller {
       } 
     });    
   }
+
 }

src/controllers/WorkflowController.ts

@@ -628,7 +628,7 @@ export class WorkflowController extends Controller {
     if (!state) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลขั้นตอนการอนุมัติ");
 
     if (state.stateUserComments.filter((x) => x.profileId == body.profileId).length > 0)
-      throw new HttpError(HttpStatus.NOT_FOUND, "มีผู้ใช้งานนี้อยู่แล้ว");
+      throw new HttpError(HttpStatus.NOT_FOUND, "ไม่สามารถเลือกซ้ำได้");
 
     const stateUserComment = new StateUserComment();
     stateUserComment.order = state.stateUserComments.length + 1;

src/interfaces/utils.ts

@@ -8,6 +8,7 @@ import { In, IsNull, MoreThan, Not } from "typeorm";
 import { RequestWithUser } from "../middlewares/user";
 import { Command } from "../entities/Command";
 import { ProfileSalary } from "../entities/ProfileSalary";
+import { Profile } from "../entities/Profile";
 export function calculateAge(start: Date, end = new Date()) {
   if (start.getTime() > end.getTime()) return null;
 
@@ -85,8 +86,13 @@ export async function calculateGovAge(profileId: string, type: string) {
 
     return { years, months, days };
   };
-
+  const profile = await AppDataSource.getRepository(Profile).findOne({
-  const firstStartDate = new Date(records[0].date);
+    where:{
+      id:profileId
+    }
+  })
+  // const firstStartDate = new Date(records[0].date);
+  const firstStartDate = profile?.dateAppoint;
   const firstEndDate = endDateFristRec ? new Date(endDateFristRec.dateGovernment) : new Date();
   
   const {