Browse Source

计算工资 调整 1.2

leiy 1 year ago
parent
commit
5a697e9ce7
1 changed files with 1 additions and 1 deletions
  1. 1 1
      OASystem/OASystem.Api/OAMethodLib/PayrollComputation.cs

+ 1 - 1
OASystem/OASystem.Api/OAMethodLib/PayrollComputation.cs

@@ -1147,7 +1147,7 @@ namespace OASystem.API.OAMethodLib
                                         Date_range date_Range = attendance.date_range;
 
                                         //筛选 不在工作日内的假勤申请
-                                        if (startDt >= date_Range.new_begin_dt || date_Range.new_end_dt > endDt)
+                                        if (startDt >= date_Range.new_begin_dt || Convert.ToDateTime( date_Range.new_end_dt.ToString("yyyy-MM-dd")) > endDt)
                                         {
                                             continue;
                                         }