计算工资

事假调整

OASystem/OASystem.Api/OAMethodLib/PayrollComputation.cs

@@ -939,7 +939,7 @@ namespace OASystem.API.OAMethodLib
 
                                         
 
-                                        for (int i = 0; i <= days; i++)
+                                        for (int i = 0; i < 999; i++)
                                         {
                                             DateTime thisDt = date_Range.new_begin_dt.AddDays(i);
                                             
@@ -1289,11 +1289,11 @@ namespace OASystem.API.OAMethodLib
                                     decimal sjLongTime = sj_slice_Info.duration / 3600.00M;
                                     if (sjLongTime == 3.00M)
                                     {
-                                        typeDeduction = typeDeduction+  personalkLeave_dailywage_day / 7.50M * 3.50M;
+                                        typeDeduction = typeDeduction +  (personalkLeave_dailywage_day / 7.50M) * 3.00M;
                                     }
                                     else if (sjLongTime == 4.50M)
                                     {
-                                        typeDeduction = typeDeduction+ personalkLeave_dailywage_day / 7.50M * 4.50M;
+                                        typeDeduction = typeDeduction + (personalkLeave_dailywage_day / 7.50M) * 4.50M;
                                     }
                                 }
                             }
@@ -1376,7 +1376,7 @@ namespace OASystem.API.OAMethodLib
                                     decimal bjLongTime = bj_slice_Info.duration / 3600.00M;
                                     if (bjLongTime == 3.00M)
                                     {
-                                        bj_halfDayWage =   (pl_dailywage_day / 7.50M) * 3.50M;
+                                        bj_halfDayWage =   (pl_dailywage_day / 7.50M) * 3.00M;
                                     }
                                     else if (bjLongTime == 4.50M)
                                     {

OASystem/OASystem.Infrastructure/Repositories/Groups/HotelPriceRepository.cs

@@ -859,7 +859,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 return _result;
             }
 
-            string sql = string.Format(@"Select hr.Id,hr.DiId,hr.GTId,hr.CTDId,hr.CheckNumber,hr.ReservationsWebsite,hr.ReservationsNo,
+            string sql = string.Format(@"Select hr.Id,hr.DiId,hr.GTId,ccp.CTDId,hr.CheckNumber,hr.ReservationsWebsite,hr.ReservationsNo,
                                          hr.DetermineNo,hr.City,hr.HotelName,hr.HotelTel,hr.HotelAddress,hr.GuestName,hr.CheckInDate,hr.CheckOutDate,
                                          hr.CheckType,hr.RoomExplanation,hr.Remark As HotelRemark,hr.SingleRoomPrice,hr.SingleRoomCount,hr.DoubleRoomPrice,
                                          hr.DoubleRoomCount,hr.SuiteRoomPrice,hr.SuiteRoomCount,hr.OtherRoomPrice,hr.OtherRoomCount,hr.CardPrice,