add posexcutive date

src/entities/view/viewRegistryOfficer.ts

@@ -55,6 +55,26 @@ import { ViewColumn, ViewEntity } from "typeorm";
       FROM profileEducation ed
       WHERE ed.isUse IS TRUE
       ORDER BY ed.level ASC
+  ),
+  PositionDate AS (
+      SELECT 
+          vcto.Years,
+          vcto.Months,
+          vcto.Days,
+          vcto.profileId,
+          ROW_NUMBER() OVER (PARTITION BY vcto.profileId) AS vcto_number
+      FROM view_current_tenure_officer vcto
+      WHERE vcto.orderNumber Is Null
+  ),
+  PositionExcDate AS (
+      SELECT 
+          vctoExc.Years,
+          vctoExc.Months,
+          vctoExc.Days,
+          vctoExc.profileId,
+          ROW_NUMBER() OVER (PARTITION BY vctoExc.profileId) AS vctoExc_number
+      FROM view_current_tenure_exc_officer vctoExc
+      WHERE vctoExc.orderNumber Is Null
   )
   SELECT 
       p.id as profileId,
@@ -100,14 +120,17 @@ import { ViewColumn, ViewEntity } from "typeorm";
       TIMESTAMPDIFF(YEAR, p.birthdate, CURDATE()) AS age,
       vcto.Years,
       vcto.Months,
-      vcto.Days
+      vcto.Days,
+      vctoExc.Years AS posExecutiveYears,
+      vctoExc.Months AS posExecutiveMonths,
+      vctoExc.Days AS posExecutiveDays
   FROM profile p
   LEFT JOIN posLevel ON p.posLevelId = posLevel.id
   LEFT JOIN posType ON p.posTypeId = posType.id
   LEFT JOIN PosMaster pm ON p.id = pm.current_holderId AND pm.pm_number = 1
   LEFT JOIN Education ed ON p.id = ed.profileId AND ed.ed_number = 1
-  Inner Join view_current_tenure_officer vcto On p.id = vcto.profileId
-  Where vcto.orderNumber Is Null
+  LEFT JOIN PositionDate vcto ON p.id = vcto.profileId AND vcto.vcto_number = 1
+  LEFT JOIN PositionExcDate vctoExc ON p.id = vctoExc.profileId AND vctoExc.vctoExc_number = 1
   `,
 })
 export class viewRegistryOfficer {
@@ -222,13 +245,12 @@ export class viewRegistryOfficer {
   @ViewColumn()
   Days: number;
 
-//   @ViewColumn()
-//   posExecutiveYears: number;
+  @ViewColumn()
+  posExecutiveYears: number;
 
-//   @ViewColumn()
-//   posExecutiveMonths: number;
-
-//   @ViewColumn()
-//   posExecutiveDays: number;
+  @ViewColumn()
+  posExecutiveMonths: number;
 
+  @ViewColumn()
+  posExecutiveDays: number;
 }