From 98811c08016d70475a041a14af21794e9246b1ca Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Tue, 30 Jul 2024 17:49:37 +0700
Subject: [PATCH] fix

---
 src/controllers/DevelopmentController.ts | 26 ++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/controllers/DevelopmentController.ts b/src/controllers/DevelopmentController.ts
index 1335012..7f297a8 100644
--- a/src/controllers/DevelopmentController.ts
+++ b/src/controllers/DevelopmentController.ts
@@ -2406,7 +2406,7 @@ export class DevelopmentController extends Controller {
       setLogDataDiff(request, { before, after: oldProfile });
       status = oldProfile.isProfile;
     }
-    
+
     if (requestBody.type == "OFFICER") {
       await new CallAPI()
         .GetData(request, `/org/unauthorize/officer/citizen/${requestBody.citizenId}`)
@@ -2415,7 +2415,8 @@ export class DevelopmentController extends Controller {
           development.dateStart =
             requestBody.dateStart == undefined ? _null : requestBody.dateStart;
           development.dateEnd = requestBody.dateEnd == undefined ? _null : requestBody.dateEnd;
-          development.order = requestBody.commandNumber == undefined ? _null : requestBody.commandNumber;
+          development.order =
+            requestBody.commandNumber == undefined ? _null : requestBody.commandNumber;
           development.dateOrder =
             requestBody.commandDate == undefined ? _null : requestBody.commandDate;
           development.trainingDays =
@@ -2451,7 +2452,11 @@ export class DevelopmentController extends Controller {
           development.dateStart =
             requestBody.dateStart == undefined ? _null : requestBody.dateStart;
           development.dateEnd = requestBody.dateEnd == undefined ? _null : requestBody.dateEnd;
-          development.order = requestBody.commandNumber == undefined ? _null : requestBody.commandNumber;
+          development.citizenId =
+            requestBody.citizenId == undefined ? _null : requestBody.citizenId;
+          development.type = requestBody.type == undefined ? _null : requestBody.type;
+          development.order =
+            requestBody.commandNumber == undefined ? _null : requestBody.commandNumber;
           development.dateOrder =
             requestBody.commandDate == undefined ? _null : requestBody.commandDate;
           development.trainingDays =
@@ -2484,7 +2489,8 @@ export class DevelopmentController extends Controller {
           development.dateStart =
             requestBody.dateStart == undefined ? _null : requestBody.dateStart;
           development.dateEnd = requestBody.dateEnd == undefined ? _null : requestBody.dateEnd;
-          development.order = requestBody.commandNumber == undefined ? _null : requestBody.commandNumber;
+          development.order =
+            requestBody.commandNumber == undefined ? _null : requestBody.commandNumber;
           development.dateOrder =
             requestBody.commandDate == undefined ? _null : requestBody.commandDate;
           development.trainingDays =
@@ -2520,9 +2526,13 @@ 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.citizenId =
+            requestBody.citizenId == undefined ? _null : requestBody.citizenId;
+          development.type = requestBody.type == undefined ? _null : requestBody.type;
+          development.order =
+            requestBody.commandNumber == undefined ? _null : requestBody.commandNumber;
+          development.dateOrder =
+            requestBody.commandDate == undefined ? _null : requestBody.commandDate;
           development.trainingDays =
             requestBody.trainingDays == undefined ? _null : requestBody.trainingDays;
           development.posLevelId = x.posLevelId;
@@ -2545,6 +2555,6 @@ export class DevelopmentController extends Controller {
           status = development.isProfile;
         });
     }
-      return new HttpSuccess(status);
+    return new HttpSuccess(status);
   }
 }