From c151e2d3f74494be6ee56eecc3532764858ccde1 Mon Sep 17 00:00:00 2001
From: gozareshgir <f0604741@gmail.com>
Date: Sun, 25 Jan 2026 19:40:28 +0330
Subject: [PATCH] some changes

---
 0_Framework/0_Framework.csproj                |  1 +
 .../Repository/CheckoutRepository.cs          | 35 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/0_Framework/0_Framework.csproj b/0_Framework/0_Framework.csproj
index 66522232..a77e5547 100644
--- a/0_Framework/0_Framework.csproj
+++ b/0_Framework/0_Framework.csproj
@@ -21,6 +21,7 @@
     <PackageReference Include="MD.PersianDateTime.Standard" Version="2.6.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="10.0.1" />
     <PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.1" />
+    <!--<PackageReference Include="DNTPersianUtils.Core" Version="6.7.1" />-->
 
 
 
diff --git a/CompanyManagment.EFCore/Repository/CheckoutRepository.cs b/CompanyManagment.EFCore/Repository/CheckoutRepository.cs
index 406fd32d..86a998fd 100644
--- a/CompanyManagment.EFCore/Repository/CheckoutRepository.cs
+++ b/CompanyManagment.EFCore/Repository/CheckoutRepository.cs
@@ -3911,7 +3911,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
 
         var leftWorkTime = watcher.Elapsed;
         watcher.Reset();
-        watcher.Start();
+        watcher.Stop();
 
         //جداسازی شروع و پایان فیش از قراداد با توجه به شروع بکار و ترک کار
         #region Separation
@@ -3919,8 +3919,8 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
         var timer = new Stopwatch();
         timer.Start();
         var separation = new List<ContractSeparationViewModel>();
-
-        foreach (var item in getContracts)
+        var seprationData = getContracts.Select(x => new { x.EmployeeId, x.ContarctStart, x.ContractEnd }).ToList();
+        foreach (var item in seprationData)
         {
             bool hasLeft = false;
             var ContractEnd = item.ContractEnd;
@@ -3932,7 +3932,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                 {
                     checker = false
                 });
-                continue;
+            
             }
 
             if (leftWork.HasLeft && leftWork.LeftWorkDate < item.ContractEnd &&
@@ -3958,7 +3958,6 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                 var PersianEndDate = new PersianDateTime(eyear, emonth, eday);
 
 
-
                 var totalmonth = ((PersianEndDate.Year - PersianStartDateAddingMount.Year) * 12) + (PersianEndDate.Month - PersianStartDateAddingMount.Month) + 1;
                 for (int i = 0; i < totalmonth; i++)
                 {
@@ -3991,7 +3990,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                     var startDate = periodSelect.startC.ToGeorgianDateTime();
                     var endDate = periodSelect.endC.ToGeorgianDateTime();
 
-                 
+
                     separation.Add(new ContractSeparationViewModel()
                     {
                         StartWorkDate = leftWork.StartWorkDate,
@@ -4003,7 +4002,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                         ContractEndGr = endDate,
                         checker = true,
                     });
-                    continue;
+                
                 }
                 else
                 {
@@ -4011,7 +4010,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                     {
                         checker = false
                     });
-                    continue;
+                 
                 }
             }
 
@@ -4094,7 +4093,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                         ContractEndGr = endDate,
                         checker = true,
                     });
-                    continue;
+          
                 }
                 else
                 {
@@ -4102,17 +4101,17 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                     {
                         checker = false
                     });
-                    continue;
+            
                 }
             }
-            else if(leftWork.HasLeft && contractStart > leftWork.LeftWorkDate)
+            else if (leftWork.HasLeft && contractStart > leftWork.LeftWorkDate)
             {
 
                 separation.Add(new ContractSeparationViewModel()
                 {
                     checker = false
                 });
-                continue;
+           
             }
             else if (!leftWork.HasLeft)
             {
@@ -4178,8 +4177,8 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                         checker = true,
                         LeftWorkDate = new DateTime(2121, 3, 21),
                     });
-                    continue;
-             
+            
+
                 }
                 else
                 {
@@ -4187,7 +4186,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                     {
                         checker = false
                     });
-                    continue;
+                 
                 }
             }
             else
@@ -4196,7 +4195,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                 {
                     checker = false
                 });
-                continue;
+         
             }
         }
 
@@ -4206,7 +4205,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
 
 
         var SeparationTime = timer.Elapsed;
-
+        timer.Stop();
         var optionTimer = new Stopwatch();
         optionTimer.Start();
         //دریافت تنظیمات فنی پرسنل ها
@@ -4597,7 +4596,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
             var overNightWorkValue = x.NightworkPay > 0 ? x.OverNightWorkValue : "-";
             var fridayWorkValue = x.FridayPay > 0 ? x.FridayWorkValue : "-";
             var maritalStatus = employees.First(e => e.EmployeeId == x.EmployeeId).MaritalStatus;
-            var rewardPay = x.RewardPay == null ? "-" : x.RewardPay.ToMoneyCheckZeroNullable();
+            var rewardPay = x.RewardPay == 0 ? "-" : x.RewardPay.ToMoney();
             var rotatingShiftValue = x.ShiftPay > 0 ? x.RotatingShiftValue : "-";
             var totalDeduction = "-";
             var totalPayment = "-";