From 293d41b0f2732aaa3bd76ec84045d9de7cb596e2 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Tue, 30 Jul 2024 17:23:45 +0700
Subject: [PATCH] fix

---
 src/controllers/DevelopmentController.ts | 22 +++++++++++-----------
 src/entities/DevelopmentHistory.ts       | 18 +++++++++---------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/controllers/DevelopmentController.ts b/src/controllers/DevelopmentController.ts
index 65ddc39..1335012 100644
--- a/src/controllers/DevelopmentController.ts
+++ b/src/controllers/DevelopmentController.ts
@@ -2388,9 +2388,9 @@ export class DevelopmentController extends Controller {
         throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, "ข้อมูลนี้ได้ถูกบันทึกแล้ว");
       oldProfile.dateStart = requestBody.dateStart == undefined ? _null : requestBody.dateStart;
       oldProfile.dateEnd = requestBody.dateEnd == undefined ? _null : requestBody.dateEnd;
-      oldProfile.order = requestBody.order == undefined ? _null : requestBody.order;
+      oldProfile.order = requestBody.commandNumber == undefined ? _null : requestBody.commandNumber;
       oldProfile.dateOrder =
-        requestBody.dateOrder == undefined ? _null : new Date(requestBody.dateOrder);
+        requestBody.commandDate == undefined ? _null : new Date(requestBody.commandDate);
       oldProfile.trainingDays =
         requestBody.trainingDays == undefined ? _null : requestBody.trainingDays;
       oldProfile.createdUserId = request.user.sub;
@@ -2415,9 +2415,9 @@ export class DevelopmentController extends Controller {
           development.dateStart =
             requestBody.dateStart == undefined ? _null : requestBody.dateStart;
           development.dateEnd = requestBody.dateEnd == undefined ? _null : requestBody.dateEnd;
-          development.order = requestBody.order == undefined ? _null : requestBody.order;
+          development.order = requestBody.commandNumber == undefined ? _null : requestBody.commandNumber;
           development.dateOrder =
-            requestBody.dateOrder == undefined ? _null : requestBody.dateOrder;
+            requestBody.commandDate == undefined ? _null : requestBody.commandDate;
           development.trainingDays =
             requestBody.trainingDays == undefined ? _null : requestBody.trainingDays;
           development.posLevelId = x.posLevelId == undefined ? _null : x.posLevelId;
@@ -2451,9 +2451,9 @@ export class DevelopmentController extends Controller {
           development.dateStart =
             requestBody.dateStart == undefined ? _null : requestBody.dateStart;
           development.dateEnd = requestBody.dateEnd == undefined ? _null : requestBody.dateEnd;
-          development.order = requestBody.order == undefined ? _null : requestBody.order;
+          development.order = requestBody.commandNumber == undefined ? _null : requestBody.commandNumber;
           development.dateOrder =
-            requestBody.dateOrder == undefined ? _null : requestBody.dateOrder;
+            requestBody.commandDate == undefined ? _null : requestBody.commandDate;
           development.trainingDays =
             requestBody.trainingDays == undefined ? _null : requestBody.trainingDays;
           development.posLevelId = x.posLevelId == undefined ? _null : x.posLevelId;
@@ -2484,9 +2484,9 @@ export class DevelopmentController extends Controller {
           development.dateStart =
             requestBody.dateStart == undefined ? _null : requestBody.dateStart;
           development.dateEnd = requestBody.dateEnd == undefined ? _null : requestBody.dateEnd;
-          development.order = requestBody.order == undefined ? _null : requestBody.order;
+          development.order = requestBody.commandNumber == undefined ? _null : requestBody.commandNumber;
           development.dateOrder =
-            requestBody.dateOrder == undefined ? _null : requestBody.dateOrder;
+            requestBody.commandDate == undefined ? _null : requestBody.commandDate;
           development.trainingDays =
             requestBody.trainingDays == undefined ? _null : requestBody.trainingDays;
           development.posLevelId = null;
@@ -2520,9 +2520,9 @@ export class DevelopmentController extends Controller {
           development.dateStart =
             requestBody.dateStart == undefined ? _null : requestBody.dateStart;
           development.dateEnd = requestBody.dateEnd == undefined ? _null : requestBody.dateEnd;
-          development.order = requestBody.order == undefined ? _null : requestBody.order;
-          development.dateOrder =
-            requestBody.dateOrder == undefined ? _null : requestBody.dateOrder;
+          // development.order = requestBody.order == undefined ? _null : requestBody.order;
+          // development.dateOrder =
+          //   requestBody.dateOrder == undefined ? _null : requestBody.dateOrder;
           development.trainingDays =
             requestBody.trainingDays == undefined ? _null : requestBody.trainingDays;
           development.posLevelId = x.posLevelId;
diff --git a/src/entities/DevelopmentHistory.ts b/src/entities/DevelopmentHistory.ts
index f5fe93e..f283e28 100644
--- a/src/entities/DevelopmentHistory.ts
+++ b/src/entities/DevelopmentHistory.ts
@@ -285,8 +285,8 @@ export class UpdateDevelopmentHistory {
 }
 
 export class CreateDevelopmentHistoryOBO {
-  @Column()
-  rank: string | null;
+  // @Column()
+  // rank: string | null;
   @Column()
   prefix: string | null;
   @Column()
@@ -298,15 +298,17 @@ export class CreateDevelopmentHistoryOBO {
   @Column()
   position: string | null;
   @Column()
-  posExecutive: string | null;
+  posExecutive?: string | null;
   @Column()
-  posLevelId: string | null;
+  posLevelId?: string | null;
   @Column()
-  posTypeId: string | null;
+  posTypeId?: string | null;
+  // @Column()
+  // developmentId: string;
   @Column()
-  developmentId: string;
+  commandNumber: string | null;
   @Column()
-  order: string | null;
+  commandDate: Date | null;
   @Column()
   trainingDays: string | null;
   @Column()
@@ -314,8 +316,6 @@ export class CreateDevelopmentHistoryOBO {
   @Column()
   type: string | null;
   @Column()
-  dateOrder: Date | null;
-  @Column()
   dateStart: Date | null;
   @Column()
   dateEnd: Date | null;