checkout change

CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs

@@ -479,6 +479,9 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
         var startDate = command.GetWorkDateHide.ToGeorgianDateTime();
         var dayliFee = "خطای تاریخ";
         double dayliFeeDouble = 0;
+        double baseYearUnAffected = 0;
+        double baseYearAffected = 0;
+        double dailySalaryAffected = 0;
         if (styear >= 1370)
         {
 
@@ -491,6 +494,14 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
             dayliFeeDouble = dayliFeeResult.DayliFeeDouble;
             dayliFeeComplete = dayliFeeResult.DayliFee.MoneyToDouble();
             basic = dayliFeeResult.Basic;
+
+
+            var baseYear = _yearlySalaryRepository.BaseYearCompute(contractStart, contractEnd, command.EmployeeId,
+                command.WorkshopId, leftworkList).Result;
+            dayliFee = (command.DailySalaryUnAffected + baseYear.BaseYearResult).ToMoney();
+
+            baseYearAffected = baseYearUnAffected;
+            dailySalaryAffected = command.DailySalaryUnAffected;
         }
 
         #endregion
@@ -520,6 +531,21 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
 
                 dayliFee = result.ToMoney();
 
+
+                #region NeWdailyWage
+
+                var da = command.DailySalaryUnAffected / 7.33;
+                dailySalaryAffected = da > 0 ? ((workedHoursePerDay * da).ToMoney()).MoneyToDouble() : 0;
+                var ba = baseYearUnAffected / 7.33;
+                baseYearAffected = ba > 0 ? ((workedHoursePerDay * ba).ToMoney()).MoneyToDouble() : 0;
+
+                var fullDailySalary = dailySalaryAffected + baseYearAffected;
+                dayliFee = fullDailySalary.ToMoney();
+
+                #endregion
+
+
+
                 var HousingAllowonceNumberType = HousingAllowance.MoneyToDouble();
                 var HousingStep1 = HousingAllowonceNumberType / 30;
                 var HousingStep2 = HousingStep1 / 7.33;
@@ -892,6 +918,13 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
             //ساعت موظفی پرسنل در این ماه
             EmployeeMandatoryHours = mandatoryHoursTimeSpan,
             #endregion
+
+            #region NewDailWage
+
+            BaseYearAffected = baseYearAffected,
+            DailySalaryAffected = dailySalaryAffected,
+
+            #endregion
         };
 
         #endregion