From 0d22239a2efcd095c175687b36447563ac935d88 Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Wed, 16 Aug 2023 14:15:45 +0700
Subject: [PATCH] Correct Execute Command

---
 .../Commands/CommandRepository.cs             | 55 ++++++++++++++++---
 1 file changed, 46 insertions(+), 9 deletions(-)

diff --git a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
index e1fe44ef..6cab8145 100644
--- a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
+++ b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
@@ -306,24 +306,61 @@ namespace BMA.EHR.Application.Repositories.Commands
                     {
                         Order = 1,
                         Date = command.CommandAffectDate,
-                        Amount = placementProfile.Amount,
-                        PositionSalaryAmount = placementProfile.PositionSalaryAmount,
-                        MouthSalaryAmount = placementProfile.MouthSalaryAmount,
-
+                        Amount = placementProfile.Amount == null ? 0 : placementProfile.Amount,
+                        PositionSalaryAmount = placementProfile.PositionSalaryAmount == null ? 0 : placementProfile.PositionSalaryAmount,
+                        MouthSalaryAmount = placementProfile.MouthSalaryAmount == null ? 0 : placementProfile.MouthSalaryAmount,
+                        SalaryClass = "",
                         SalaryRef = "บรรจุและแต่งตั้งผู้สอบแข่งขันได้วุฒิ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}",
 
                         OcId = oc == null ? Guid.Empty : oc.Id,
-                        PositionExecutiveId = placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutive!.Id,
-                        PositionExecutiveSideId = placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutiveSide!.Id,
+
+
                         PositionLevel = placementProfile.PositionLevel,
                         PositionLineId = placementProfile.PositionLine!.Id,
                         PositionTypeId = placementProfile.PositionType!.Id,
                         OrganizationShortNameId = placementProfile.OrganizationPosition!.Organization!.OrganizationShortName!.Id,
+                        PosNoId = positionNumber!.Id,
 
                         CommandNo = $"{command.CommandNo}/{command.CommandYear}",
-                        CommandTypeName = command.CommandType.Name
+                        CommandTypeName = command.CommandType.Name,
+
+
+                        PositionEmployeeGroupId = null,
+                        PositionEmployeeLevelId = null,
+                        PositionEmployeePositionId = null,
+                        PositionEmployeePositionSideId = null,
+                        PosNoEmployee = "",
+
+
+                        PositionPathSideId = placementProfile.PositionPathSide! == null ? null : placementProfile.PositionPathSide!.Id,
+                        PositionExecutiveId = placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutive! == null ? null : placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutive!.Id,
+                        PositionExecutiveSideId = placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutiveSide! == null ? null : placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutiveSide!.Id,
+
+                        CreatedAt = DateTime.Now,
+                        CreatedFullName = FullName,
+                        CreatedUserId = UserId,
+                        LastUpdatedAt = DateTime.Now,
+                        LastUpdateFullName = FullName,
+                        LastUpdateUserId = UserId,
+                       
                     };
 
+                    //if (placementProfile.PositionPathSide! != null)
+                    //{
+                    //    salary.PositionPathSideId = placementProfile.PositionPathSide!.Id;
+                    //}
+                    //else
+
+                    //if (placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutive! != null)
+                    //{
+                    //    salary.PositionExecutiveId = placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutive!.Id;
+                    //}
+
+                    //if (placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutiveSide! != null)
+                    //{
+                    //    salary.PositionExecutiveSideId = placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutiveSide!.Id;
+                    //}
+
                     // add profile position
                     var profilePosition = new ProfilePosition
                     {
@@ -629,10 +666,10 @@ namespace BMA.EHR.Application.Repositories.Commands
                         {
                             // get prev record
                             var prev = await _dbContext.Set<CommandReceiver>()
-                                                .Include (c => c.Command)
+                                                .Include(c => c.Command)
                                                 .Where(x => x.Command.Id == commandID)
                                                 .Where(x => x.Sequence < currentSeq)
-                                                .OrderByDescending(x => x.Sequence)                                            
+                                                .OrderByDescending(x => x.Sequence)
                                                 .Take(1)
                                                 .FirstOrDefaultAsync();