เพิ่มฟิว isDirecter isOfficer

src/controllers/EmployeePositionController.ts

@@ -255,6 +255,8 @@ export class EmployeePositionController extends Controller {
             ? null
             : `${position.posType.posTypeShortName} ${position.posLevel.posLevelName}`,
         positionIsSelected: position.positionIsSelected,
+        isOfficer: posMaster.isOfficer,
+        isDirecter: posMaster.isDirector,
       })),
     };
     return new HttpSuccess(formattedData);
@@ -611,6 +613,8 @@ export class EmployeePositionController extends Controller {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลอัตรากำลัง");
     }
     posMaster.posMasterNo = requestBody.posMasterNo;
+    posMaster.isDirector = requestBody.isDirector;
+    posMaster.isOfficer = requestBody.isOfficer;
     posMaster.posMasterNoPrefix = requestBody.posMasterNoPrefix;
     posMaster.posMasterNoSuffix = requestBody.posMasterNoSuffix;
     posMaster.reason = requestBody.reason == null ? "" : requestBody.reason;

src/controllers/PositionController.ts

@@ -797,6 +797,8 @@ export class PositionController extends Controller {
     if (!posMaster) {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลอัตรากำลัง");
     }
+    posMaster.isDirector = requestBody.isDirector;
+    posMaster.isOfficer = requestBody.isOfficer;
     posMaster.posMasterNo = requestBody.posMasterNo;
     posMaster.posMasterNoPrefix = requestBody.posMasterNoPrefix;
     posMaster.posMasterNoSuffix = requestBody.posMasterNoSuffix;
@@ -949,6 +951,8 @@ export class PositionController extends Controller {
         position.positionExecutiveField = x.posDictExecutiveField;
         position.positionArea = x.posDictArea;
         position.isSpecial = x.isSpecial;
+        position.isOfficer = x.isOfficer;
+        position.isDirector = x.isDirector;
         position.positionIsSelected = x.positionIsSelected;
         position.posMasterId = posMaster.id;
         position.createdUserId = request.user.sub;
@@ -1001,6 +1005,8 @@ export class PositionController extends Controller {
         positionArea: position.positionArea,
         positionIsSelected: position.positionIsSelected,
         isSpecial: position.isSpecial,
+        isOfficer: posMaster.isOfficer,
+        isDirecter: posMaster.isDirector,
       })),
     };
     return new HttpSuccess(formattedData);

src/entities/EmployeePosMaster.ts

@@ -237,6 +237,12 @@ export class CreateEmployeePosMaster {
 
   @Column()
   reason: string | null;
+
+  @Column()
+  isDirector: boolean;
+
+  @Column()
+  isOfficer: boolean;
 }
 
 export type UpdateEmployeePosMaster = Partial<EmployeePosMaster>;

src/entities/PosMaster.ts

@@ -236,6 +236,12 @@ export class CreatePosMaster {
 
   @Column()
   reason: string | null;
+
+  @Column()
+  isDirector: boolean;
+
+  @Column()
+  isOfficer: boolean;
 }
 
 export type UpdatePosMaster = Partial<PosMaster>;