เพิ่มจำนวนรุ่นตามแผน

src/controllers/DevelopmentController.ts

@@ -1394,8 +1394,13 @@ export class DevelopmentController extends Controller {
         "developmentActualPeoples",
         "developmentPlannedPeoples",
         "developmentActualGoals",
+        "developmentActualGoals.posTypeActual",
+        "developmentActualGoals.posLevelActual",
+        "developmentActualGoals",
         "developmentPlannedGoals",
         "developmentPlannedGoals.plannedGoalPositions",
+        "plannedGoalPositions.posTypePlanned",
+        "plannedGoalPositions.posLevelPlanned",
       ],
     });
     if (!getDevelopment) {
@@ -1422,19 +1427,44 @@ export class DevelopmentController extends Controller {
       actualGoals:
         getDevelopment.developmentActualGoals == null
           ? null
-          : getDevelopment.developmentActualGoals.sort((a, b) =>
+          : getDevelopment.developmentActualGoals
-              (a.groupTarget == null ? "" : a.groupTarget).localeCompare(
+              .sort((a, b) =>
-                b.groupTarget == null ? "" : b.groupTarget,
+                (a.groupTarget == null ? "" : a.groupTarget).localeCompare(
-              ),
+                  b.groupTarget == null ? "" : b.groupTarget,
-            ),
+                ),
+              )
+              .map((x) => ({
+                groupTarget: x.groupTarget,
+                groupTargetSub: x.groupTargetSub,
+                position: x.position,
+                posTypeId: x.posTypeActualId,
+                posType: x.posTypeActual == null ? null : x.posTypeActual.posTypeName,
+                posLevelId: x.posLevelActualId,
+                posLevel: x.posLevelActual == null ? null : x.posLevelActual.posLevelName,
+                type: x.type,
+                amount: x.amount,
+              })),
       plannedGoals:
         getDevelopment.developmentPlannedGoals == null
           ? null
-          : getDevelopment.developmentPlannedGoals.sort((a, b) =>
+          : getDevelopment.developmentPlannedGoals
-              (a.groupTarget == null ? "" : a.groupTarget).localeCompare(
+              .sort((a, b) =>
-                b.groupTarget == null ? "" : b.groupTarget,
+                (a.groupTarget == null ? "" : a.groupTarget).localeCompare(
-              ),
+                  b.groupTarget == null ? "" : b.groupTarget,
-            ),
+                ),
+              )
+              .map((x) => ({
+                groupTarget: x.groupTarget,
+                groupTargetSub: x.groupTargetSub,
+                position: x.plannedGoalPositions.map((y) => ({
+                  position: y.position,
+                  posTypeId: y.posTypePlannedId,
+                  posType: y.posTypePlanned == null ? null : y.posTypePlanned.posTypeName,
+                  posLevelId: y.posLevelPlannedId,
+                  posLevel: y.posLevelPlanned == null ? null : y.posLevelPlanned.posLevelName,
+                })),
+                amount: x.amount,
+              })),
     };
     return new HttpSuccess(_getDevelopment);
   }
@@ -1461,7 +1491,8 @@ export class DevelopmentController extends Controller {
     }
     let _getDevelopment: any = {
       developmentProjectTypes: getDevelopment.developmentProjectTypes.map((x) => x.name).sort(),
-      projectModal: getDevelopment.projectModal,
+      projectModalActual: getDevelopment.projectModalActual,
+      projectModalPlanned: getDevelopment.projectModalPlanned,
       isBackPlanned: getDevelopment.isBackPlanned,
       isHoldPlanned: getDevelopment.isHoldPlanned,
       projectDayBackPlanned: getDevelopment.projectDayBackPlanned,

src/entities/Development.ts

@@ -190,10 +190,17 @@ export class Development extends EntityBase {
 
   @Column({
     nullable: true,
-    comment: "จำนวน(รุ่น)",
+    comment: "จำนวน(รุ่น)ตามแผน",
     default: null,
   })
-  projectModal: number;
+  projectModalPlanned: number;
+
+  @Column({
+    nullable: true,
+    comment: "จำนวน(รุ่น)ตามจริง",
+    default: null,
+  })
+  projectModalActual: number;
 
   ////////////////////////////////////////tab ผลประเมิน
   @OneToMany(
@@ -583,7 +590,9 @@ export class UpdateDevelopment3 {
   @Column()
   developmentProjectTypes?: string[];
   @Column()
-  projectModal?: number | null;
+  projectModalActual?: number | null;
+  @Column()
+  projectModalPlanned?: number | null;
   @Column()
   isBackPlanned?: boolean | null;
   @Column()

src/migration/1713338710965-update_table_dev_add_governmentEndDate2.ts

@@ -0,0 +1,18 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class UpdateTableDevAddGovernmentEndDate21713338710965 implements MigrationInterface {
+    name = 'UpdateTableDevAddGovernmentEndDate21713338710965'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`development\` DROP COLUMN \`projectModal\``);
+        await queryRunner.query(`ALTER TABLE \`development\` ADD \`projectModalPlanned\` int NULL COMMENT 'จำนวน(รุ่น)ตามแผน'`);
+        await queryRunner.query(`ALTER TABLE \`development\` ADD \`projectModalActual\` int NULL COMMENT 'จำนวน(รุ่น)ตามจริง'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`development\` DROP COLUMN \`projectModalActual\``);
+        await queryRunner.query(`ALTER TABLE \`development\` DROP COLUMN \`projectModalPlanned\``);
+        await queryRunner.query(`ALTER TABLE \`development\` ADD \`projectModal\` int NULL COMMENT 'จำนวน(รุ่น)'`);
+    }
+
+}