Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop

src/controllers/CommandController.ts

@@ -5008,7 +5008,6 @@ export class CommandController extends Controller {
       statusReport: "DONE",
     }));
     await this.posMasterActRepository.save(data);
-
     await Promise.all(
       posMasters.map(async (item) => {
         if (item.posMasterChild != null && item.posMasterChild.current_holderId != null) {
@@ -5049,6 +5048,7 @@ export class CommandController extends Controller {
             createdAt: new Date(),
             lastUpdatedAt: new Date(),
             commandNo: body.refIds[0].commandNo,
+            refCommandNo: body.refIds[0].commandNo,
             commandYear: body.refIds[0].commandYear,
             posNo: item.posMaster.posMasterNo,
             posNoAbb: shortName,
@@ -5058,7 +5058,7 @@ export class CommandController extends Controller {
             commandName: body.refIds[0].commandName,
             remark: body.refIds[0].remark,
           };
-
+           
           const dataAct = new ProfileActposition();
           Object.assign(dataAct, metaAct);
           const historyAct = new ProfileActpositionHistory();

src/controllers/ProfileSalaryController.ts

@@ -80,6 +80,55 @@ export class ProfileSalaryController extends Controller {
     return new HttpSuccess(record);
   }
 
+  @Get("tenure/{profileId}")
+  public async getPositionTenure(@Path() profileId: string, @Request() req: RequestWithUser) {
+    const position = await AppDataSource.query(
+      "CALL GetProfileSalaryPosition(?)",
+      [profileId]
+    );
+    const _position = position.length > 0 ? position[0] : []
+    const mapPosition = _position.length > 1
+      ? _position
+          .slice(1)
+          .map((curr: any, index: number) => ({
+              year: curr.Years ? Math.floor(Number(curr.Years)) : 0,
+              month: curr.Months ? Math.floor(Number(curr.Months)) : 0,
+              day: curr.Days ? Math.floor(Number(curr.Days)) : 0,
+              name: _position[index]?.positionName
+            }))
+      : [];
+
+    const posLevel = [{
+      year: 1,
+      month: 0,
+      day: 0,
+      name: "ต้น",
+    }];
+    
+    const posExecutive = await AppDataSource.query(
+      "CALL GetProfileSalaryExecutive(?)",
+      [profileId]
+    );
+    const _posExecutive = posExecutive.length > 0 ? posExecutive[0] : []
+    const mapPosExecutive = _posExecutive.length > 1
+      ? _posExecutive
+          .slice(1)
+          .map((curr: any, index: number) => ({
+              year: curr.Years ? Math.floor(Number(curr.Years)) : 0,
+              month: curr.Months ? Math.floor(Number(curr.Months)) : 0,
+              day: curr.Days ? Math.floor(Number(curr.Days)) : 0,
+              name: _posExecutive[index]?.positionName
+            }))
+      : [];
+
+    return new HttpSuccess({
+      position: mapPosition,
+      posLevel: posLevel, 
+      posExecutive: mapPosExecutive
+    });
+  }
+
+
   @Get("admin/{profileId}")
   public async getSalaryAdmin(@Path() profileId: string, @Request() req: RequestWithUser) {
     let _workflow = await new permission().Workflow(req, profileId, "SYS_SALARY_OFFICER");